Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 17:43:37 +0000 (10:43 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 17:43:37 +0000 (10:43 -0700)
commit30000aac11a41d895aa7ef155eca218abf739b9a
tree115f54a5855bc428083a6ca6f3fefba38da1c85e
parentf0face2b48bb12b9cc55a2a877d5b3184d6aa50e
parent7406ef40cdafef300262b0dc3eef90eeb582a7e7
Merge branch 'master' into Gtk.