Merge branch '1675-preactivation'
authorTom Clegg <tom@curoverse.com>
Tue, 31 Dec 2013 02:02:33 +0000 (18:02 -0800)
committerTom Clegg <tom@curoverse.com>
Tue, 31 Dec 2013 02:02:33 +0000 (18:02 -0800)
commit14baeb15c9a703a7c7b5c36b2ddcbf44c35c4c7a
tree910752788365a8868e93e48941938dcb707a2e88
parent22dc7d543f4b484b8dc658292ddf0afef00fb98a
parentd088be45bcdd2069e62e0c7133a451855f2d25a9
Merge branch '1675-preactivation'

closes #1722
closes #1785