Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Jun 2013 11:56:01 +0000 (13:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Jun 2013 11:56:07 +0000 (13:56 +0200)
* lukaszmluki/master:
  ftp: fix using uninitialized value

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

Trivial merge