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)
commit61efe145e16a1a275094ffcdf040c80b15cd9de6
treee39048662024670ed1d50a89face424cfad2babd
parentbbefc8e129c52134c62405c693846876541aac0e
parentee8fdc432afecf9397c9f1685a0ad02105736879
Merge branch 'master' into session_lock