Merge branch 'master' into remotefork
authorChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:00:35 +0000 (19:00 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:00:35 +0000 (19:00 +0200)
commit1797cbc2b010552b54e9d070820fa9cbc9ce3af9
treef4ac239f23e5cdccd75e4ec514abedbd582f4333
parent63575a005e8e2386abb24e97791e18d61e6350fe
parent149e039741f94f9e22bd2c8d7dcf33158a110e79
Merge branch 'master' into remotefork
www/.htaccess