Merge branch 'master' into aac
authorAndre <maan@p133.(none)>
Fri, 12 May 2006 15:00:10 +0000 (17:00 +0200)
committerAndre <maan@p133.(none)>
Fri, 12 May 2006 15:00:10 +0000 (17:00 +0200)
commit67cc91aedd748c8b6dee29b5203e17e68530fd21
tree03814051209bedd4dcaedb4504de41c9e399e257
parent5a506c5917569033b95d36f6425ec7f54e7d022a
parent39f4ce8ef309f5ee3e800494a726cda1412916be
Merge branch 'master' into aac

Conflicts:

Makefile.in

Makefile.in looks fine. WTF is git complaining about?