Merge branch 'master' of ssh://notion.git.sourceforge.net/gitroot/notion/notion
commitce12b9efd061bdf1ed55b2fb13bc8c3796dce59c
authorArnout <arnouten@bzzt.net>
Sun, 29 Jul 2012 08:06:39 +0000 (29 10:06 +0200)
committerArnout <arnouten@bzzt.net>
Sun, 29 Jul 2012 08:06:39 +0000 (29 10:06 +0200)
treee87475405911b165628fa623c29103152bedf9ec
parenta58082150b12314456302b44dd5dea7b7a1b1b4b
parentccaa694c7f7349ffe3b712b58fe40db6426d3cf1
Merge branch 'master' of ssh://notion.git.sourceforge.net/gitroot/notion/notion
etc/cfg_notioncore.lua