From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 24 Apr 2012 12:40:26 +0000 (+0200)
Subject: Merge branch 'master' into graceful_stop
X-Git-Tag: v1.3.0~2
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=11189d6e01308c7326d8a2c091e61bb79ba38d08;p=yazpp-moved-to-github.git

Merge branch 'master' into graceful_stop
---

11189d6e01308c7326d8a2c091e61bb79ba38d08