Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 22 Apr 2013 14:37:14 +0000 (16:37 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 22 Apr 2013 14:37:14 +0000 (16:37 +0200)

Trivial merge