Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 08:45:13 +0000 (10:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 08:45:37 +0000 (10:45 +0200)
commit3d5a995eac2a47ac116c3412b364c0d21717829b
tree868ccd797d79473c7e382765a1ebc58ff367c969
parentc1488fab3dd402d6d26b2b9124ab448715a8f01f
parente52567c2954f627d420b30f75f71af2f2e4afe80
Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'

* commit 'e52567c2954f627d420b30f75f71af2f2e4afe80':
  build: Strip spurious labels

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
library.mak