Merge branch 'vojo-dev' into vojo-production vojo-0.6.92
authormario romero <mariorz@gmail.com>
Fri, 12 Dec 2014 03:59:21 +0000 (21:59 -0600)
committermario romero <mariorz@gmail.com>
Fri, 12 Dec 2014 03:59:21 +0000 (21:59 -0600)
commit075d45232ac3aafa1014ae73f97e1dc822c36d73
tree02468ff50e98ab6607fa2b4eca013d961a894fd2
parentbd3b2c9e4f140e224f9ccb411af825b0652c750f
parent44ae83faf907ebf2430accacf10c31eb166e43c3
Merge branch 'vojo-dev' into vojo-production