Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 16 Oct 2013 00:13:45 +0000 (17:13 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 16 Oct 2013 00:13:45 +0000 (17:13 -0700)
commitddfd92cf07beefce995e980416768c0e2f0d4806
tree729abc5ced7e6250ee1bd7641d8655473143b439
parente6778d3dff7cf65ea78f194818dc1366dd704ae5
parent48c449b972bb2245d640c14e2603d0f2e308c028
Merge branch 'master' into Gtk.