Merge branch 'vojo-dev' into vojo-production vojo-0.6.8
authormario romero <mariorz@gmail.com>
Tue, 18 Nov 2014 06:25:07 +0000 (00:25 -0600)
committermario romero <mariorz@gmail.com>
Tue, 18 Nov 2014 06:25:07 +0000 (00:25 -0600)
commitefe616c27d5e703a47fd507b0d1c8d5dce1fe17b
tree487cace1b464d595e9496a1bebdceb197dc21325
parente7fcc77fadf7b715cf7e760ead574c9efad9867b
parent551eb7c10cb87fa9b368f149a151e683c310ddc1
Merge branch 'vojo-dev' into vojo-production