Merge branches 'login' and 'logout'
authorJoey Schulze <joey@infodrom.org>
Mon, 25 Feb 2013 17:06:18 +0000 (18:06 +0100)
committerJoey Schulze <joey@infodrom.org>
Mon, 25 Feb 2013 17:06:18 +0000 (18:06 +0100)

Trivial merge