Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 01:04:33 +0000 (18:04 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 01:04:33 +0000 (18:04 -0700)
commitd18133effc7b90ab1f46cf2201c8c261d81cc365
tree0fbfee899e4b0b9c2c5aa4ed22f086349f206759
parent3b2a449fb51f15c257dad8e87d06ca386deacdaf
parentb2ff5f89616b3e33c9035ad40c69949c6e615a6d
Merge branch 'master' into Gtk.