Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev
authorEdward L Platt <ed@elplatt.com>
Thu, 6 Jun 2013 17:31:36 +0000 (13:31 -0400)
committerEdward L Platt <ed@elplatt.com>
Thu, 6 Jun 2013 17:31:36 +0000 (13:31 -0400)
commit0f137b9e3648b868392964feaaf2c2b14b01879e
treea08e44513a0a3fc108c68c1219f8e1f562d5448d
parentce739cad606b2eb398382d66b91ab38e6f1c3ea1
parent59e720a0a5e11a21183afda06091e5a39a868488
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev