Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.4-c
authorRahul Bhargava <rahulb@media.mit.edu>
Thu, 24 May 2012 15:57:18 +0000 (11:57 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Thu, 24 May 2012 15:57:18 +0000 (11:57 -0400)
commit796fe86fc495f5f44dd81c1084ea5a2b364f2d4c
tree428f7fd0bbe30e7ca4a568a53a50ee29e70e1545
parent5f55f7edc36033168fae823d01f7ec7c008cd181
parentc756aff4ef5106b2065b32d718e907adc9aed2ef
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production