Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birchwood-abbey.net>
Fri, 12 Aug 2016 20:20:08 +0000 (13:20 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Fri, 12 Aug 2016 20:20:08 +0000 (13:20 -0700)
commit688c88d10651a24e5472a33e2360b230201b4b4c
tree0bdd508f582f6d95666771c01731ee8cf8b15d49
parent3db748c1cc29bfa39ad020b355ff713c2536b513
parentfa8a992d8a3fbba5be48a7bb8255d61364f5087f
Merge branch 'master' into Gtk.