Merge commit 'upstream/1.8.3'
authorBdale Garbee <bdale@gag.com>
Sun, 23 Oct 2011 05:41:45 +0000 (23:41 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 23 Oct 2011 05:41:45 +0000 (23:41 -0600)
commitd31a64ca61e3b63a08649d8a238184e77d63539d
treec4b050fa3ac7f4f02c93ace8e9cd1a1ea44dd6c7
parent1082cc42ea987d207b21c4afd8cc94e8c65c06cf
parent6ba3f54741e413f12fdc27fbc8d1ba85f94c64a2
Merge commit 'upstream/1.8.3'