Merge pull request #576 from zonque/resolved-cleanups
authorTom Gundersen <teg@jklm.no>
Mon, 13 Jul 2015 17:30:30 +0000 (19:30 +0200)
committerTom Gundersen <teg@jklm.no>
Mon, 13 Jul 2015 17:30:30 +0000 (19:30 +0200)
resolved: assorted cleanups


Trivial merge