Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Mon, 16 Sep 2013 19:17:49 +0000 (12:17 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Mon, 16 Sep 2013 19:17:49 +0000 (12:17 -0700)
commit7f9294828748d4f5d3580fb44bed4a365f96451f
tree9e676a15ea623e1abc9fc3bf9c7506b33ff63de8
parent6e208c637c0cee335b67eb9c3bc1c8866fc3c9f6
parent866ac2bb9c26215a974f85c1fe3c6267750290b2
Merge branch 'master' into Gtk.