Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.6-f
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 21 Sep 2012 02:06:53 +0000 (22:06 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 21 Sep 2012 02:06:53 +0000 (22:06 -0400)
commit919e9896d8953532222b74df9801535f2eb9684e
tree23d438d7154296f73136c9a3b55f3e81b108884e
parentd10f62ad9df76d31dec7018040d15f925472f282
parent62cd44f11f371043bd9219f61fb442b65eb51808
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production