Merge branch vojo-dev into vojo-production for weekly release. vojo-0.5.7-f
authorEdward L Platt <ed@elplatt.com>
Fri, 30 Nov 2012 18:33:18 +0000 (13:33 -0500)
committerEdward L Platt <ed@elplatt.com>
Fri, 30 Nov 2012 18:33:18 +0000 (13:33 -0500)
commitfe27c2578040e9be83b0730be3c006343d65b892
tree5873f2d8597888b17d61676ecfab63ecff94afa7
parent4f22ba0316589ff909b5a0e4e272dc62e67633c5
parentbb3f926998a22d6fc6d5fdd9a1cf1e4d0df5ddfb
Merge branch vojo-dev into vojo-production for weekly release.