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)
commit5c231f76e4383676fca71cff3064fb0b3e308d7f
tree591c3b89690eded1729fa43a43a1393f57910d3b
parentef814c1b8ddbfd3df749a33c440f1beddacf1262
parentf5fec0fc426069517d53c504ca4bab04b90517c5
parente1b3006db5798bf70b4c2427b8f3de1363e718e5
parenta84fd72a0f466f958d147045f1e7ba48ff9c2c96
Merge branches 'input-check-clear', 'listedit', 'rico-bug' and 'rico-db'