Merge remote-tracking branch 'origin/vojo-dev' into vojo-production vojo-0.5.7-b
authorEdward L Platt <ed@elplatt.com>
Fri, 19 Oct 2012 19:45:01 +0000 (15:45 -0400)
committerEdward L Platt <ed@elplatt.com>
Fri, 19 Oct 2012 19:45:01 +0000 (15:45 -0400)
commit3e7a8bd09f1a014b6ae5f7eaf0e7c5725b6d6ee6
treec73b6e098e757470c823e438d816d07a5308faec
parent3fe25450086837e1e46661f762efb56787f99c5e
parent4413ccd208b7f28341802ad50f678e60b169a0f6
Merge remote-tracking branch 'origin/vojo-dev' into vojo-production