Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 10 Sep 2013 00:16:53 +0000 (17:16 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 10 Sep 2013 00:16:53 +0000 (17:16 -0700)
commitb0d331a78793bc7659809af5a662ee06450eaa2b
treed4353eb2884d0a97ac57821e9e90e04f192b22e6
parenta2e6dad9695fbb4654ffdeca2d7ce38e72b1f879
parent586d84107061cf455acdf0074e5ab6225c46a0ff
Merge branch 'master' into Gtk.