Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.4-a
authorRahul Bhargava <rahulb@media.mit.edu>
Thu, 10 May 2012 20:01:22 +0000 (16:01 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Thu, 10 May 2012 20:01:22 +0000 (16:01 -0400)
commit7e00ea1b94ed875d40fe542861a6fa3c97c8d9a5
tree38ea0020a41bcb3280858c6b75cac53cd0528bf9
parenteb729f3f6dda068c707a830efbe50748cb6f694c
parent11dfbc4975e564aa5db9adc34758608af0b14912
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production