wayofthepie/riverd — pull request #7 by wayofthepie (2014-12-29 21:17:55+00:00)
Title: Merge branch 'persistent' into stash-client

Same changes persistent merged in.....