Merge remote-tracking branch 'upstream/master'
authorMichael Totschnig <michael@totschnig.org>
Mon, 2 Dec 2013 07:53:39 +0000 (08:53 +0100)
committerMichael Totschnig <michael@totschnig.org>
Mon, 2 Dec 2013 07:53:39 +0000 (08:53 +0100)
commit01f5526a8376d67a08c0f0cbc173baac51c000e0
treeab94d1a51fd716590a02cc310d4f56243f33a9dd
parent503d8e6b8458549b0962a93014d7fa86ad83711e
parent970e0f40ef89d27ab9f52413ed93a470bdc269eb
Merge remote-tracking branch 'upstream/master'