From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 13 Dec 2011 01:57:27 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Tag: 0.10~14
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=c221b22d61df5882462eab41e5c79ae2a3ea9642

Merge branch 'master' into python3
---

c221b22d61df5882462eab41e5c79ae2a3ea9642