Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 17:19:11 +0000 (10:19 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 17:19:11 +0000 (10:19 -0700)
commitf0face2b48bb12b9cc55a2a877d5b3184d6aa50e
tree89c8a6ea63f5bd0fad9b8fe24d9df67a8aca1b82
parent78d998409dc5e62c73d41270cc74d802d1fa16c5
parent8a710c9ba6b48baa488cc0a0607d9a28318a69a9
Merge branch 'master' into Gtk.