From: Christian Lamparter Date: Sat, 23 Nov 2013 14:11:26 +0000 (+0100) Subject: Merge branch 'master' into halfandquarter X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=a1e80351a81876d63caf7d37b1fc5ef465ed8f78;hp=-c;p=carl9170fw.git Merge branch 'master' into halfandquarter --- a1e80351a81876d63caf7d37b1fc5ef465ed8f78