Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Apr 2013 08:57:31 +0000 (10:57 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Apr 2013 08:57:31 +0000 (10:57 +0200)

Trivial merge