Merge remote-tracking branch 'upstream/master'
authorMichael Totschnig <michael@totschnig.org>
Sun, 1 Dec 2013 21:47:24 +0000 (22:47 +0100)
committerMichael Totschnig <michael@totschnig.org>
Sun, 1 Dec 2013 21:47:24 +0000 (22:47 +0100)
commit41792908aa9bfa59db0253d8a5cd7de304674ed2
tree139fe756f51056c9bee8afb4e3243f9f86f29bd8
parentd31a5bc788fdf133178af20d0f0e72a2248836df
parentff452e501f66bb8838f7c2ecd26b87ccd5a5af78
Merge remote-tracking branch 'upstream/master'