Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production vojo-0.5.6-c
authorRahul Bhargava <rahulb@media.mit.edu>
Fri, 27 Jul 2012 13:18:07 +0000 (09:18 -0400)
committerRahul Bhargava <rahulb@media.mit.edu>
Fri, 27 Jul 2012 13:18:07 +0000 (09:18 -0400)
commitdf253ac7b99da43fc67a27edb0e1068795ad4475
tree088ed67f7baf03e6b427a56e073fa3238a14d118
parent14174d7322fc42f3a562a3bbcfe4b9a7d522223d
parentf768eb6f9ae8ed7625dd73d7f587ac92c18199e7
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-production