Merge branch 'common' of gitorious.org:vozmob/vozmob into common
authorsquiggy rubio <squiggy@mirabot.coop>
Fri, 1 Feb 2013 00:17:28 +0000 (16:17 -0800)
committersquiggy rubio <squiggy@mirabot.coop>
Fri, 1 Feb 2013 00:17:28 +0000 (16:17 -0800)
commit4a9f68e946bb649f6a03269579d9c51dc748e3b1
tree027ae7c3372d8a41bf6c9902a075df5f64423099
parent9e96777600e6ea3ea63b54228f6d64aa1149c18a
parent252409170bb0e5e9c03d5b2ed6c4cf0005dbdd9c
Merge branch 'common' of gitorious.org:vozmob/vozmob into common