Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 00:00:26 +0000 (17:00 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 00:00:26 +0000 (17:00 -0700)
commit5bddaf60f44d80fc64459da97ff6e972136e01f0
treec27cc06aba0d5e2b5c0d547e4bd4fe426e5971a6
parent7f9294828748d4f5d3580fb44bed4a365f96451f
parent0416d00dcc3678c5ca48bae9eead883fde1c7fb9
Merge branch 'master' into Gtk.