Merge remote-tracking branch 'mfischer/pcre' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:01:17 +0000 (00:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:01:17 +0000 (00:01 +0100)

Trivial merge