Merge branch 'master' of git://gitorious.org/vozmob/vozmob
authorsquiggy rubio <squiggy@resist.ca>
Mon, 10 Dec 2012 01:22:24 +0000 (17:22 -0800)
committersquiggy rubio <squiggy@resist.ca>
Mon, 10 Dec 2012 01:22:24 +0000 (17:22 -0800)
commit745fa09a111210a11d1d544ec0acfdba6346de04
tree0ca1e6e8705cfc69677d1e4c3186f68e0deb1b23
parent0d0d01aa178b3026a8095b4561cdc838fd8bf039
parent055b138d4d7ac6de759a8fb9d80e4eea52d33c61
Merge branch 'master' of git://gitorious.org/vozmob/vozmob