Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production vojo-0.5.3-a
authorRahul Bhargava <rahulb@media.mit.edu>
Thu, 12 Apr 2012 20:38:30 +0000 (16:38 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Thu, 12 Apr 2012 20:38:30 +0000 (16:38 -0400)
commit0e77974cf0f3ef8a119c985c2f4baee8d7e5d062
tree7fe2d8c168c14304dbe3126158c1f686d1a61e2b
parent9b4fc8ad66fc826efcd65e806bece0e8c89af0bc
parentf7354b834a02ee7400895a36038718137bf7ecec
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production