Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 9 Oct 2013 19:06:16 +0000 (12:06 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 9 Oct 2013 19:06:16 +0000 (12:06 -0700)
commit4c4219a6ea0e4111c20dea85b6941ee5e62c4188
tree44edc91ce5d4dbb6f99cab5bd05a1f604f5b9afa
parent480813a99d2095ae6f0eb54a25a49b8106af9057
parent164ffcba1d508f6a2a90c32479d3c166ba9bd526
Merge branch 'master' into Gtk.