From: Florian Forster <ff@octo.it>
Date: Wed, 28 Jul 2010 08:21:05 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v4.0.0~72
X-Git-Url: https://git.octo.it/?p=collection4.git;a=commitdiff_plain;h=03687b5145e11d6f5eb7f235d826a850b801c1d0

Merge remote branch 'origin/master'

Conflicts:
	src/main.c
---

03687b5145e11d6f5eb7f235d826a850b801c1d0