diff options
author | nikrou <nikrou@piwigo.org> | 2006-04-09 14:50:14 +0000 |
---|---|---|
committer | nikrou <nikrou@piwigo.org> | 2006-04-09 14:50:14 +0000 |
commit | a820112d5993f2706baf7ebd555445ad63ab8e9d (patch) | |
tree | 043f790025f1f8a999d9a87a64cba661e63101f6 /include | |
parent | b64c5176dd7ee2fbfb2d9714f2570b4d5506d42d (diff) |
merge from branch-1_6 into trunk:
svn merge -r1141:1142
git-svn-id: http://piwigo.org/svn/trunk@1143 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions