Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 4 Feb 2016 04:36:08 +0000 (21:36 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 4 Feb 2016 04:36:08 +0000 (21:36 -0700)
commit3735fd4dc7f0f0e9ff4dc3d7fae1c3d886313228
tree8125b5414ea660af70cc90feb062d95296aea13c
parent79d7045a0de6dae02bb908be8d684cd9a1ea4620
parentb5e556346593ccaf21181ea1fe05326ca5efe455
Merge branch 'master' into Gtk.