Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev
authorsquiggy rubio <squiggy@mirabot.coop>
Mon, 10 Jun 2013 23:09:53 +0000 (16:09 -0700)
committersquiggy rubio <squiggy@mirabot.coop>
Mon, 10 Jun 2013 23:09:53 +0000 (16:09 -0700)
commit129ea343681c0122549570a92d65e629649af9a3
tree1f628177b130753dc3e9259bc0490365f318e59c
parent7296b04355548aef0f33e2e20bb9087aa00b6a02
parentd39c6c78bbebe49a58bf55efff02f72e63a9e9be
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev