Merge branch 'cleanup_functions' into 'master'
authorMicah <micah@riseup.net>
Fri, 24 Feb 2017 20:29:01 +0000 (20:29 +0000)
committerMicah <micah@riseup.net>
Fri, 24 Feb 2017 20:29:01 +0000 (20:29 +0000)
Cleanup functions

See merge request !3


Trivial merge