Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 12:57:00 +0000 (14:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 12:57:40 +0000 (14:57 +0200)
commit1eda312aca278c81fea9f0f67413b3ee9f386b4a
tree513723b74639e4ae4c3e6c6e7f6bbea6b9212ae7
parent7dba57d1fa6b21e88f9539e1e02a07dd07899cda
parent47e3e1097e09da7f973908e09df15e3bb7c5e1f4
Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
  cmdutils: Use the correct guard

Conflicts:
cmdutils.c

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