Merge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:27:17 +0000 (02:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:27:27 +0000 (02:27 +0100)
commit9b669f9b14134c5d3e9f03ae987ade15689bd14c
tree65f16e4ed56413c3ad92669dd53f0504ca5d45cf
parent099e0178bf560154f39f9043c0f915396f06e706
parent93bf4a74de99300fdc0deb83f672bf12e6f1c262
Merge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4

* commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262':
  configure: Fix enabling memalign_hack automatically

Conflicts:
configure

See: 3d93ba562243b6d8afac3c875c05304d41da94bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>