Merge remote-tracking branch 'upstream/master' into fko_dump
authorFranck Joncourt <franck@debian.org>
Sat, 10 Aug 2013 12:32:34 +0000 (14:32 +0200)
committerFranck Joncourt <franck@debian.org>
Sat, 10 Aug 2013 12:32:34 +0000 (14:32 +0200)
1  2 
lib/fko_util.c

diff --cc lib/fko_util.c
Simple merge