merge from trunk; remove unused

git-svn-id: http://piwigo.org/svn/branches/2.1@6574 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2010-06-22 19:33:33 +00:00
parent 32828aa848
commit 913e3a8c41

Diff content is not available