From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 4 Jan 2006 23:44:35 +0000 (+0000)
Subject: Merged upstream v1.2.
X-Git-Tag: 1.2-1~6
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=f3c82666d618b39536e46f123109699e552bd3e7;hp=f3c82666d618b39536e46f123109699e552bd3e7;p=memories.git

Merged upstream v1.2.
---