Merge branch 'master' into gsoc-dir-split
commite8c0a7ae8ffb56522d6f7900a12394d3b68cedec
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 26 Jul 2010 00:06:24 +0000 (26 02:06 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 26 Jul 2010 00:06:24 +0000 (26 02:06 +0200)
tree5813206cd04824403cb4ce8dbd0758c385d75e35
parentd5007c2884f35b508901caa248672176219f5c19
parent9f869537704de93ace31ac48b8dab4ecbfad0546
Merge branch 'master' into gsoc-dir-split
apps/settings.c