Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.5-d vojo-0.5.6-a
authorRahul Bhargava <rahulb@media.mit.edu>
Wed, 18 Jul 2012 13:25:24 +0000 (09:25 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Wed, 18 Jul 2012 13:25:24 +0000 (09:25 -0400)
commit11daf679c59b056c45f382e6987a4e0763fcb613
treeeb49a80a2fa90d847aa2e716405417b69defa87a
parent8c8e6b286d1395bdb05566e82568c717eebe01b2
parent787930457ab72b6605b12c62ac7ff7edf724c32a
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production