Merge branch 'vojo-dev' into vojo-production vojo-0.5.7-c
authorEdward L Platt <ed@elplatt.com>
Thu, 1 Nov 2012 01:07:27 +0000 (21:07 -0400)
committerEdward L Platt <ed@elplatt.com>
Thu, 1 Nov 2012 01:07:27 +0000 (21:07 -0400)
commita947128cd08ea8ce4f49856d12944bead41cd525
tree1d149d51f0270cda4a1e4295675ca33cf6c3611b
parent3e7a8bd09f1a014b6ae5f7eaf0e7c5725b6d6ee6
parente6c5ddadce9331a344c87a19cce03cc3e645779f
Merge branch 'vojo-dev' into vojo-production