Merge remote-tracking branch 'upstream/master'
authorMichael Totschnig <michael@totschnig.org>
Mon, 2 Dec 2013 07:51:43 +0000 (08:51 +0100)
committerMichael Totschnig <michael@totschnig.org>
Mon, 2 Dec 2013 07:51:43 +0000 (08:51 +0100)
commit464e066754866b1d70d5dd670df0b3916ec06cff
tree5d88313c31b4e2da1b751c54e1ce7fe4ddf6082c
parent5e308c06f33df20ee6a66087143c01a573cf11ca
parent787f29bbfbca64778dbcb9d0ae102efcde44c536
Merge remote-tracking branch 'upstream/master'