Merge branch 'import'
authorJoey Schulze <joey@infodrom.org>
Mon, 19 May 2014 08:26:57 +0000 (10:26 +0200)
committerJoey Schulze <joey@infodrom.org>
Mon, 19 May 2014 08:26:57 +0000 (10:26 +0200)

Trivial merge