Merge branch 'vojo-dev' into vojo-production vojo-0.6.5
authormario romero <mariorz@gmail.com>
Thu, 6 Nov 2014 06:40:08 +0000 (00:40 -0600)
committermario romero <mariorz@gmail.com>
Thu, 6 Nov 2014 06:40:08 +0000 (00:40 -0600)
commit084455f21466bdacddd63552674e4f172e476ad4
treee3b0c7e0e5b41fdc493b970da9d1cde702b299e0
parentd6d93693a868f1274d1ddeb632d961133e5dea56
parentb4a336290f98bd10e5313cbbfa7951029b90e62b
Merge branch 'vojo-dev' into vojo-production