Merge branch 'NewSettings'
authorAndrea Diamantini <adjam7@gmail.com>
Mon, 24 May 2010 08:51:13 +0000 (10:51 +0200)
committerAndrea Diamantini <adjam7@gmail.com>
Mon, 24 May 2010 08:51:13 +0000 (10:51 +0200)
commit26a44960973ef75995212417b69774a308cd869f
tree07ce4c6777fc5cb575f0bc07e8239d9a56bd54c2
parentdabc35315078dd974aec0e0f8204388d765b5bce
parentc03cf973fd44223335615b6dd576785746e2b409
Merge branch 'NewSettings'