Merge branch 'upstream' into debian origin/debian origin/v1.1.0
authorBdale Garbee <bdale@gag.com>
Tue, 23 Mar 2010 02:58:53 +0000 (20:58 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 23 Mar 2010 02:58:53 +0000 (20:58 -0600)
commitd2486dbf0f536423f63334f5c27218de17585e39
treea848f7eb3388061775ec331f2c5266c33b8698b8
parent2c962a206d5949f8847f74180b072b97533ec832
parent4ce144011e6d290e47db1d3e5574c3f0b3d8a83c
Merge branch 'upstream' into debian

Conflicts:
cleanup-script.sh