Merge tag 'upstream/1.8.7'
authorBdale Garbee <bdale@gag.com>
Tue, 13 Aug 2013 09:15:25 +0000 (11:15 +0200)
committerBdale Garbee <bdale@gag.com>
Tue, 13 Aug 2013 09:15:25 +0000 (11:15 +0200)
commitb7d632693014bd53a13eb4f3e3dc2926d0c40fdd
tree6dfc4ca36bb57117e46640070299b638940869bc
parent90cbd246139b847d390233642627843209605981
parente8db7f6eea9b35527ddd4532affabd18a30549b5
Merge tag 'upstream/1.8.7'

Upstream version 1.8.7