Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.5-c
authorRahul Bhargava <rahulb@media.mit.edu>
Thu, 5 Jul 2012 20:24:16 +0000 (16:24 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Thu, 5 Jul 2012 20:24:16 +0000 (16:24 -0400)
commit4c972b4c2678559f2bc523cb3dcb2bb5f81f18b0
tree084694bc0c226b2665fef0879767d4b2045a719e
parente61a2b79f99e6c901fc6423e7522b950ae08db44
parentd348a5289f54a9bd0d0aaac17a38fa3bdca0b707
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production