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)
commitfa2e672a9d308ffb5b3d2af51db7b2c388d4be16
tree185f403a5abb1c65e90678e109821bdc4aabb577
parent58c786fd8c5e66b11f57363798076eb0afe4c74a
parent8d8b1f8bee3fd19b7f86423569684c445d7c85fb
Merge branch 'history-titles'
src/setting.c