Merge branch 'vojo-dev' into vojo-production vojo-0.6.7
authormario romero <mariorz@gmail.com>
Thu, 13 Nov 2014 00:21:17 +0000 (18:21 -0600)
committermario romero <mariorz@gmail.com>
Thu, 13 Nov 2014 00:21:17 +0000 (18:21 -0600)
commite7fcc77fadf7b715cf7e760ead574c9efad9867b
treef765019c1c2702d722876f76a52d15635bd78f3f
parentef48aa005bf2e45f19697843f93403640fec7a96
parent5ce5ad223cde433c59d20c76ed739885c65d92aa
Merge branch 'vojo-dev' into vojo-production