Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.5-b
authorRahul Bhargava <rahulb@media.mit.edu>
Thu, 28 Jun 2012 01:22:14 +0000 (21:22 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Thu, 28 Jun 2012 01:22:14 +0000 (21:22 -0400)
commite61a2b79f99e6c901fc6423e7522b950ae08db44
tree603277e02cfaedc9ab64f063042e8d2455d083b7
parentadf6af4883b132b996afae9ccfab8aad57f4b50f
parentac97e6effda13add19905ad31f9da0d7cc6de9b4
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production