From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 11 Sep 2011 10:41:29 +0000 (+0100)
Subject: Merge branch 'pcre' into next
X-Git-Tag: 4.1~167
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=67cf37ce66b0ffc800f72e66e51cefe80fea68cc;p=i3%2Fi3

Merge branch 'pcre' into next
---

67cf37ce66b0ffc800f72e66e51cefe80fea68cc