Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.4-b
authorRahul Bhargava <rahulb@media.mit.edu>
Mon, 21 May 2012 15:03:45 +0000 (11:03 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Mon, 21 May 2012 15:03:45 +0000 (11:03 -0400)
commit5f55f7edc36033168fae823d01f7ec7c008cd181
tree986237ad9e21d807281025b87db63609ec63bfe0
parent7e00ea1b94ed875d40fe542861a6fa3c97c8d9a5
parent2470e4584806b7ecbe75a46b84e0251ea60389d1
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production