Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production vojo-0.5.3-b
authorRahul Bhargava <rahulb@media.mit.edu>
Thu, 19 Apr 2012 18:11:37 +0000 (14:11 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Thu, 19 Apr 2012 18:11:37 +0000 (14:11 -0400)
commit8019c861d1119249e7e7963e09e89fae3cfce18c
tree16ac84d1ab3386e05e8a8ceb22a7d3c72277f15e
parent0ddf5b6ceae0b1fe72dfacb30a3e54c13aaba365
parentfc7078ff834a4da11dfc0e0721b80dd8a0ce7b0c
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production