Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 20 Feb 2013 12:42:31 +0000 (13:42 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 20 Feb 2013 12:42:31 +0000 (13:42 +0100)

Trivial merge