Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 12 Sep 2013 19:39:24 +0000 (12:39 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 12 Sep 2013 19:39:24 +0000 (12:39 -0700)
commitd6a7e9e7b49c2026aeb702a2fbc85efaa7fa0362
tree091768523ace32eaa9c4387e33f1060a786635f5
parente1f2fc0bd5db02845f51142565ad8a56d2d33aed
parent535f1d0f767393b1e39adf6886d94c5b5e616be8
Merge branch 'master' into Gtk.