Merge branches 'input-check-clear', 'listedit', 'rico-bug' and 'rico-db' master
authorJoey Schulze <joey@infodrom.org>
Mon, 24 Feb 2014 18:54:32 +0000 (19:54 +0100)
committerJoey Schulze <joey@infodrom.org>
Mon, 24 Feb 2014 18:54:32 +0000 (19:54 +0100)

Trivial merge