Merge branch 'pete-fixes' closes #3096
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 27 Jun 2014 12:47:59 +0000 (08:47 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 27 Jun 2014 12:47:59 +0000 (08:47 -0400)
commit377b4f345a5ba45bb96497a6be2b571604a695a1
tree3692841f54e95d22ab0cbb01bbdbde3d0742fc8a
parentbfc0b74c4f4e5b6485393827735ff9a875d4d8ac
parent6980251b6acb935d84706133c5837f597c69ead8
Merge branch 'pete-fixes' closes #3096