]> www.infradead.org Git - pidgin-chime.git/commitdiff
Merge branch 'master' of ssh://kaos-source.amazon.com//kaos/git/stash/dwmw2/chime
authorDavid Woodhouse <dwmw@amazon.co.uk>
Wed, 22 Nov 2017 14:48:36 +0000 (14:48 +0000)
committerDavid Woodhouse <dwmw@amazon.co.uk>
Wed, 22 Nov 2017 14:48:36 +0000 (14:48 +0000)

Trivial merge