Merge branch 'history'
authorJoey Schulze <joey@infodrom.org>
Wed, 22 Jan 2014 10:20:34 +0000 (11:20 +0100)
committerJoey Schulze <joey@infodrom.org>
Wed, 22 Jan 2014 10:20:34 +0000 (11:20 +0100)

Trivial merge