From: Johannes Weißl <jargon@molb.org>
Date: Sun, 5 Dec 2010 03:59:41 +0000 (+0100)
Subject: Merge branch 'master' into screen-git
X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/39586be61e51b7991b3a43a9efc6d771d2f50f1c?hp=39586be61e51b7991b3a43a9efc6d771d2f50f1c

Merge branch 'master' into screen-git

Conflicts:
	muttjump
---