Merge branch '6997-keepstore-mem' refs #6997
authorTom Clegg <tom@curoverse.com>
Thu, 27 Aug 2015 21:17:36 +0000 (17:17 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 27 Aug 2015 21:17:36 +0000 (17:17 -0400)

Trivial merge