Merge branch 'xscreensaver-files'
authorJoachim Breitner <mail@joachim-breitner.de>
Mon, 21 Jun 2010 08:16:12 +0000 (10:16 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Mon, 21 Jun 2010 08:16:12 +0000 (10:16 +0200)
commit1da25e46c709eb20aafb904c9d0d304fec4d4e85
tree4b4abc0433c85f9c36f010627cdcab476f45a703
parent77130aa94982cfca6de9d359cec72ab0ea09363a
parentc402b9ac4afbc2f20204792212e43be87fa2df67
Merge branch 'xscreensaver-files'