Merge branch '9456-less-clear-trash'
authorTom Clegg <tom@curoverse.com>
Thu, 7 Jul 2016 15:43:35 +0000 (11:43 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 7 Jul 2016 15:43:35 +0000 (11:43 -0400)
commitc07314d641177cfcecf4321a7b7e6771702f5916
tree53dd1afca352a490b7466ff1e97dcef7f3b281b7
parentedbd43f2b89a915cf33b963c1e1ae86447c1e93b
parentecda32d08a4f6d80a2f02ae305fdb43e141672ce
Merge branch '9456-less-clear-trash'

closes #9456