Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.6-b
authorRahul Bhargava <rahulb@media.mit.edu>
Wed, 18 Jul 2012 16:36:20 +0000 (12:36 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Wed, 18 Jul 2012 16:36:20 +0000 (12:36 -0400)
commit14174d7322fc42f3a562a3bbcfe4b9a7d522223d
tree4f6bc13a55c9f86aaab5b9ec5c140b03156b308d
parent11daf679c59b056c45f382e6987a4e0763fcb613
parentc2162d90626138fb6d3346b5073b309b49a5ab67
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production