Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.7-a
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 12 Oct 2012 02:22:44 +0000 (22:22 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 12 Oct 2012 02:22:44 +0000 (22:22 -0400)
commit3fe25450086837e1e46661f762efb56787f99c5e
tree661d7643f78c63d9ee4b60e0158487c92ceded10
parent919e9896d8953532222b74df9801535f2eb9684e
parent5c23969dcee060f4b86c719f7cedb3615c9d3a06
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production