Merge branch 'master' into aac
authorAndre <maan@p133.(none)>
Wed, 10 May 2006 23:08:50 +0000 (01:08 +0200)
committerAndre <maan@p133.(none)>
Wed, 10 May 2006 23:08:50 +0000 (01:08 +0200)
commit5a506c5917569033b95d36f6425ec7f54e7d022a
treef671d1cd19dbcea8fa39be965ab54852dd6ee664
parent18e45e829467d615860462e46fa8de3be90ca2b8
parent95488d221ea22f761a6a4b78410c4e0e89f522b8
Merge branch 'master' into aac

Conflicts:

configure.ac

configure.ac looks fine. Why the hell is git complaining?
nothing to commit