Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 21:47:31 +0000 (22:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 21:47:40 +0000 (22:47 +0100)
commit61bc3d80e9d819a08111476d9301445aec7d9fff
tree180e2b10bd4a9b1f7422f285f8f86f2187d0c1b4
parent33f9b2436aab7020af0852f34654280e71b7b50f
parent0ec1642b60a5b1a4d913e2b9e3899173dff77e7a
Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'

* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a':
  cmdutils: don't log an error in opt_default().

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