./all clean: also back out of merge conflicts
authorRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 07:44:58 +0000 (09:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 07:44:58 +0000 (09:44 +0200)
commit8fa0fcb4cb1e63a3f008ba9024c862716e79beb5
tree08abeeaec7ecc0a7f84764034a336f663e9a6a58
parent1ed9707eafd94de1e8db7fc07394e1d5c62a3c58
./all clean: also back out of merge conflicts
all