Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.4-e
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 15 Jun 2012 01:55:00 +0000 (21:55 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 15 Jun 2012 01:55:00 +0000 (21:55 -0400)
commit02f44f5e143572292241469bdb3d4c0c8405acaa
tree3eabed53e872e5bb51088cbe0dd19c9f726d9a5f
parent698247017046b3297fe635e103a6a588f3692612
parentf31da0476cbdff0861643f7e98b16991f7c0bf62
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production