From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 6 Nov 2008 18:18:27 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.8.2~31
X-Git-Url: https://git.cameronkatri.com/cgit.git/commitdiff_plain/b8a7eb12d459c48943e31762b24b169af8c427a1?hp=e4d2f2b042100182ff5b214fd6848b71d70fad7d

Merge branch 'stable'
---