Merge branch 'master' into module_log_level
authorDennis Schafroth <dennis@indexdata.com>
Tue, 22 May 2012 15:17:59 +0000 (17:17 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 22 May 2012 15:17:59 +0000 (17:17 +0200)

Trivial merge