Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.6-e
authorRahul Bhargava <rahulb@media.mit.edu>
Thu, 2 Aug 2012 20:26:36 +0000 (16:26 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Thu, 2 Aug 2012 20:26:36 +0000 (16:26 -0400)
commitd10f62ad9df76d31dec7018040d15f925472f282
tree8340583102c04325d274ee82a9954a6a4f7098d5
parent7a0985174442766a846639e2df6d458474571ffb
parenteb32ced7047b74f88011f4ca466d8ce5b5887129
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production