From: Will Thompson <will@willthompson.co.uk>
Date: Wed, 25 Jan 2012 16:01:32 +0000 (+0000)
Subject: Merge branch 'highlight-regex'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=ddd8a9a000833d87260f81c4459063b32e2e14e7

Merge branch 'highlight-regex'
---

ddd8a9a000833d87260f81c4459063b32e2e14e7