Merge branch 'history-titles'
authorDaniel Carl <danielcarl@gmx.de>
Thu, 18 Jul 2013 18:02:53 +0000 (20:02 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Thu, 18 Jul 2013 18:02:53 +0000 (20:02 +0200)
1  2 
src/setting.c

diff --cc src/setting.c
Simple merge