Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Sun, 17 Jan 2016 19:18:05 +0000 (12:18 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sun, 17 Jan 2016 19:18:05 +0000 (12:18 -0700)
commitf72177ea6c6e8433f8bd2227362a6c25e39496cd
tree00e213bce73ec1fa5ba2ab6ae74766b149f82459
parent21eb9ea373a37578a9c96a6c9501345da08ae795
parentf0f7294aa4aaa92c901866271ae6fe39966de7da
Merge branch 'master' into Gtk.