Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.3-d
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 4 May 2012 00:53:47 +0000 (20:53 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 4 May 2012 00:53:47 +0000 (20:53 -0400)
commit5377cc303ab3895608bfbcc2290326975b9ae23b
treeef8f332a7cf9110d75e4e28b80d562026539fdab
parent39e536ae6417d43386c562c043a944bb50296634
parentfe8a3b69b4f2658fbcbf563490b9c6093145e738
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production