refs #8178
authorradhika <radhika@curoverse.com>
Tue, 26 Jan 2016 17:08:21 +0000 (12:08 -0500)
committerradhika <radhika@curoverse.com>
Tue, 26 Jan 2016 17:08:21 +0000 (12:08 -0500)
Merge branch '8178-keepstore-trash-interface'


Trivial merge