Merge branch 'master' into gsoc-dir-split
commit57b3223c8b349be637b891aef204a07ca6defd08
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sun, 25 Jul 2010 14:51:19 +0000 (25 16:51 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sun, 25 Jul 2010 14:51:19 +0000 (25 16:51 +0200)
tree175d15a43a02759ab2d415b024f1aed0267a9162
parent2f1102f8c000c04ba2d6185fb4774f6f96d81ef8
parentf36cf86a55e588d673b2d4cbc777845ee5b1f45c
Merge branch 'master' into gsoc-dir-split
apps/settings.c