From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 1 Jul 2012 11:07:32 +0000 (+0200)
Subject: Merge branch 'master' of github.com:gunnarbeutner/strawberry
X-Git-Tag: v0.0.1~342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2c04f604f0b60d3ee303deca60fd2665f1cd18c;p=icinga2

Merge branch 'master' of github.com:gunnarbeutner/strawberry

Conflicts:
	base/dictionary.cpp
---

e2c04f604f0b60d3ee303deca60fd2665f1cd18c