Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 04:29:22 +0000 (21:29 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 04:29:22 +0000 (21:29 -0700)
commitace56c21b6d2e5e423602f2f1d586af186c9b8c7
tree6e6de2c7e2ba1654e7c1ac8568bafe5cfaddb46d
parentd18133effc7b90ab1f46cf2201c8c261d81cc365
parent64582030436e2ce259b61648d93bf02b677ed0a8
Merge branch 'master' into Gtk.