Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Fri, 29 Apr 2016 21:24:42 +0000 (14:24 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Fri, 29 Apr 2016 21:24:42 +0000 (14:24 -0700)
commitcb326e1beb54f68c06b61ffb4dd265218af5eacc
tree685b866a4f5e68321372d88e213a185d8e7d71e6
parentb68631153ff387bf81ca1d77532c44000e04a3d2
parent6df4f73e48be7d8261efc7ae462ce2be0b4a676d
Merge branch 'master' into Gtk.