Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Apr 2012 11:57:31 +0000 (13:57 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Apr 2012 11:57:31 +0000 (13:57 +0200)
commit5b13052f4b5e568e3511d87c2e20c5332fc7db91
tree6c4a90b676be8cef6257c749279c8a50c4b0278a
parent15ea05a9ad38b8f63868845eff0ebb62c3d8b0a1
parentf7e9a24fefaa0fc07d82d4462eeb38af0f25460e
Merge branch 'master' into graceful_stop