Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Tue, 29 Mar 2016 23:50:12 +0000 (16:50 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Tue, 29 Mar 2016 23:50:12 +0000 (16:50 -0700)
commit40f8a507b2a2aac8bff82f90b454114df536e6c9
treeb67744466b209d5d9c9526ea143053c28ea44338
parent654910a63f188084e9dd4f30907a621e6a01b5fa
parent1128f8e7bd02ed3462ba95e80b77dfca61eb2475
Merge branch 'master' into Gtk.