Merge branch 'vojo-dev' into vojo-production vojo-0.5.7-g
authorEdward L Platt <ed@elplatt.com>
Wed, 5 Dec 2012 21:40:35 +0000 (16:40 -0500)
committerEdward L Platt <ed@elplatt.com>
Wed, 5 Dec 2012 21:40:35 +0000 (16:40 -0500)
commit8d6cd9ae6621b52b25ee9118a989ecbbd29cf1dc
tree86dcfd4b20bfd580e05ac15023635984d9aa86c4
parentfb280754451bd83ad5a1a52004fb156cfbe73651
parent548579b6ce28b5a3f6d8d81ffdc31843439faaca
Merge branch 'vojo-dev' into vojo-production