Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:38:31 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:38:44 +0000 (00:38 +0100)
* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
  cmdutils: Use the correct guard

Conflicts:
cmdutils.c

See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c

diff --cc cmdutils.c
Simple merge