Merge branch '3413-keep-trash-list'
authorTim Pierce <twp@curoverse.com>
Wed, 24 Sep 2014 19:05:03 +0000 (15:05 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 24 Sep 2014 19:05:03 +0000 (15:05 -0400)
Closes #3413.

1  2 
services/keepstore/handlers.go

Simple merge