Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sat, 27 Aug 2016 16:18:49 +0000 (09:18 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sat, 27 Aug 2016 16:18:49 +0000 (09:18 -0700)
commit758a2fb400c9c6f51335bdd2fa9038638ad1a841
tree6166933f125e09b18760c1dd4f0eaabb939fbc3c
parent688c88d10651a24e5472a33e2360b230201b4b4c
parent5b75bf1f3048a464a6adbdf7ee6f310a50d96148
Merge branch 'master' into Gtk.