Merge remote-tracking branch 'upstream/master'
authorMichael Totschnig <michael@totschnig.org>
Sun, 1 Dec 2013 21:02:36 +0000 (22:02 +0100)
committerMichael Totschnig <michael@totschnig.org>
Sun, 1 Dec 2013 21:02:36 +0000 (22:02 +0100)
commitd31a5bc788fdf133178af20d0f0e72a2248836df
tree1e2c7c925bf0c487233940314528e92cdcfb4a24
parent5df328c7cc26ca101c7a883d3e18ecbef2f0b5c7
parentbae399ccc2bcd3cf65a75b6db6ecad04736bf60a
Merge remote-tracking branch 'upstream/master'