From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 29 Jan 2009 21:21:24 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.8.2~4
X-Git-Url: https://git.cameronkatri.com/cgit.git/commitdiff_plain/d6174b7aab476c2b6a86e59d98cf978d603045f4

Merge branch 'stable'
---

d6174b7aab476c2b6a86e59d98cf978d603045f4