Merge branch 'master' into fix_ffi_args
authorKarel Gardas <karel.gardas@centrum.cz>
Mon, 18 Jan 2016 11:49:15 +0000 (12:49 +0100)
committerKarel Gardas <karel.gardas@centrum.cz>
Mon, 18 Jan 2016 11:49:15 +0000 (12:49 +0100)
commit680766bbf029a391d4c4334648aa4739274cb25f
tree87bdfc3e54f65f6af7edca7b3caa88adc3a99623
parenta3afd03cf3b46e3344c3274606a3d42b1b08a254
parent40b792062cfe1289460323228a0b6c7487300980
Merge branch 'master' into fix_ffi_args

Conflicts:
cfg/system.config.in
cfg/system.config.in