Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Tue, 5 Jan 2016 23:40:12 +0000 (16:40 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Tue, 5 Jan 2016 23:40:12 +0000 (16:40 -0700)
commit803f9942eba244773ae762214716998b09ef91ba
tree3c98c70a1e79402be7e3adc0db83980241dab538
parentbaee882784999453212e85fc2f3e58613d3c77de
parentb44cbfebe30c47faace0a51bf33b7ea06cb4eda0
Merge branch 'master' into Gtk.