Merge branch '6221-write-trash-list'
authorBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 16:08:52 +0000 (12:08 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 16:10:19 +0000 (12:10 -0400)
commit4d6e05c25c6a5d72afee37f8165b006267b4183d
tree665271b2f7d6e679cfc5188e46492fbb6016ea94
parent6988f4d44d2f8f7fc4aa2c381334c44d3133cf31
parent50419ea603e697dd53690842a07a279577d1ca68
Merge branch '6221-write-trash-list'

Closes #6221, #6673.