Merge branch 'vojo-dev' into vojo-production vojo-0.6.2
authormario romero <mariorz@gmail.com>
Tue, 30 Sep 2014 05:45:50 +0000 (00:45 -0500)
committermario romero <mariorz@gmail.com>
Tue, 30 Sep 2014 05:45:50 +0000 (00:45 -0500)
commitaf15d7234255742aff1e2ed8c71636104a2ae92c
tree032d72eff396d37f6a22ae69ab429cad24610f73
parentd177dbd102f6f6fc99ff7c2c21405ce2570698f2
parent78d942be5e9e448d9bb27abcb9a144a46c6708a8
Merge branch 'vojo-dev' into vojo-production