Merge branch 'vojo-dev' into vojo-production vojo-0.6.91
authormario romero <mariorz@gmail.com>
Fri, 12 Dec 2014 02:52:52 +0000 (20:52 -0600)
committermario romero <mariorz@gmail.com>
Fri, 12 Dec 2014 02:52:52 +0000 (20:52 -0600)
commitbd3b2c9e4f140e224f9ccb411af825b0652c750f
treec4e283e30c3df3dc311ce947cfb0d704aecf4823
parentd270d71031910e7476810c16b372bccd8492231c
parent084a7f2c8498e6e0b2d0151053906862b7c6d7e3
Merge branch 'vojo-dev' into vojo-production