Merge branch 'xscreensaver-files' of /tmp/blubb
authorJoachim Breitner <mail@joachim-breitner.de>
Tue, 8 Dec 2009 00:04:28 +0000 (01:04 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Tue, 8 Dec 2009 00:04:28 +0000 (01:04 +0100)
commit6835535da338dc6d461c5cce4398c8716326a47b
tree79dda520e3ab2b5e9df2222b3ab6f1682e2d86a4
parentdfc8f3453833fff9f304f29e09dd7daf5c89555e
parent90ee9126b47dad000b06d8dc6047280beb047178
Merge branch 'xscreensaver-files' of /tmp/blubb