Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.4-d
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 8 Jun 2012 01:23:11 +0000 (21:23 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 8 Jun 2012 01:23:11 +0000 (21:23 -0400)
commit698247017046b3297fe635e103a6a588f3692612
tree142e747a92f54848ae871e5ff05a1192c00b0d96
parent796fe86fc495f5f44dd81c1084ea5a2b364f2d4c
parentd238cc83206c7ec769d0269e5ae9b3f08fccbce4
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production