From: slack <slack@ommadawn.(none)>
Date: Sun, 22 Jun 2008 13:51:34 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v0.1~50
X-Git-Url: http://slack.codemaniacs.com/git/?a=commitdiff_plain;h=17e7135cb2753f3c305949811c8a434383d6b381;p=wenboi.git

Merge commit 'origin/master'
---

17e7135cb2753f3c305949811c8a434383d6b381