Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.5-a
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 22 Jun 2012 20:27:57 +0000 (16:27 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 22 Jun 2012 20:27:57 +0000 (16:27 -0400)
commitadf6af4883b132b996afae9ccfab8aad57f4b50f
tree5cd24f2993a26504851a9bdcf5e5257f39c33d99
parentff914cd11554dedc91421ac4f58a1416401f9edf
parent9a851d09a138ece8df64680a0d9f1637d15d1e3a
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production