Merge branch 'klammerj-master'
authorClifford Wolf <clifford@clifford.at>
Sat, 25 Feb 2017 15:36:23 +0000 (16:36 +0100)
committerClifford Wolf <clifford@clifford.at>
Sat, 25 Feb 2017 15:36:23 +0000 (16:36 +0100)
commiteec2df6ad1e237ec19f871753b72d9c485930456
treee5799aa5c6b46ed8fb5101c98c220c386773f607
parentf3324ed0cc35590e4d0042f6265b83bab0af37bf
parentc7d128672846bfbbbb2cdf34ddcb65bd7f296a32
Merge branch 'klammerj-master'