Nico Schottelius 9eef95a0b6 Merge branch '2.1' ... Signed-off-by: Nico Schottelius <nico@brief.schottelius.org> Conflicts: docs/changelog		2012-11-02 15:59:32 +01:00
..
dev/logs	Merge branch '2.1'	2012-11-02 15:59:32 +01:00