Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Sun, 6 Jul 2014 02:56:34 +0000 (19:56 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sun, 6 Jul 2014 02:56:34 +0000 (19:56 -0700)
commit5314749787f593ed8ccbbee0f2e09c01e6462cbf
treeb731ec7309b916664eb9e31b64de407816e195c6
parent6508997e78e07eeabd272c558c256dd4cb23bc91
parent9b0f273002edae327d3af6ea3907484b105f324d
Merge branch 'master' into Gtk.