Merge branch vojo-dev into vojo-production. vojo-0.5.7-d
authorEdward L Platt <ed@elplatt.com>
Wed, 7 Nov 2012 20:04:37 +0000 (15:04 -0500)
committerEdward L Platt <ed@elplatt.com>
Wed, 7 Nov 2012 20:04:37 +0000 (15:04 -0500)
commit58bb1bf08909f1f4ae5f1658bfe732693c126089
tree9784b60adf5dca22fb3af88701ae846145d46c55
parenta947128cd08ea8ce4f49856d12944bead41cd525
parenteeb724561bf41d09973a6831644d6b9092ac9e72
Merge branch vojo-dev into vojo-production.