Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.3-c
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 27 Apr 2012 02:26:51 +0000 (22:26 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 27 Apr 2012 02:26:51 +0000 (22:26 -0400)
commit39e536ae6417d43386c562c043a944bb50296634
tree584710837279163e01f2bb2d6fa3d3b4a7d89bb1
parentc69ae9c2e9eae93510895120dbf06a89ee559549
parentd3ed7e0c11b63b25f20f0c8f900c70651ae05a8b
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production