From: Phillip Berndt <phillip.berndt@googlemail.com>
Date: Fri, 29 Nov 2013 06:43:48 +0000 (+0100)
Subject: Merge remote-tracking branches 'tachylatus/master' and 'herm/master'
X-Git-Tag: 1.0~155
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fautorandr.git;a=commitdiff_plain;h=a5a1747c1a453639a4b193e2acd0d932548edece

Merge remote-tracking branches 'tachylatus/master' and 'herm/master'
---

a5a1747c1a453639a4b193e2acd0d932548edece