Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.6-d
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 27 Jul 2012 14:12:47 +0000 (10:12 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 27 Jul 2012 14:12:47 +0000 (10:12 -0400)
commit7a0985174442766a846639e2df6d458474571ffb
tree048c4af7843d6581a309301c73d46a16bcd9967e
parentdf253ac7b99da43fc67a27edb0e1068795ad4475
parent06cfbed6ec37b8d767a7f3479bfbc43b33d9c6eb
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production