From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 7 Nov 2009 14:35:36 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.9~60
X-Git-Url: https://git.cameronkatri.com/cgit.git/commitdiff_plain/4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e

Merge branch 'stable'
---

4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e