From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 3 Feb 2013 02:29:45 +0000 (+0100)
Subject: Merge branches 'block' and 'py-reserve'
X-Git-Tag: 0.12~6
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=27ca317cc6d19aa6080eae9a446212e928696bf5

Merge branches 'block' and 'py-reserve'
---

27ca317cc6d19aa6080eae9a446212e928696bf5