./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)

No differences found