small update
Merge branch 'master' of github.com:zenphoto/zenphoto
Remove "new album" button from users with no albums they can edit
Close XSRF hole on "tab" name
release id 0d2915e099
Merge remote-tracking branch 'origin/master' into 1.4.5
Package update

Please, when you add or remove files as in
4b9326b93dded5b0eb803d16568b1fa7bd18d2ff run the package update and
commit its changes as well. Otherwise, new files are likely to be
deleted and old files will register a complaint.
#338

Fixes the debuglog error.
fix #339
#338

fixes categories feed
Abort setup of PHP version is not at least version 5

Seems that setup may fail anyway because of PHP v4 syntax errors.
Merge remote-tracking branch 'origin/master' into 1.4.5
insure that the count of conbinews items represents the number of items that will be got

NOTE:

This simply uses the result of getCombiNews() for the count, caching the
request for efficiency. It makes NO ATTEMPT to insure that the proper
RIGHTS management is applied in getting the items.

It also necessarily assumes that the calls on the count function are
compatible with the calls on the get function, but there is no
justification for this since there are no parameters to countCombiNews
other than the "published" value.
Merge branch 'master' of github.com:zenphoto/zenphoto
update japanese
update Japanese
Update Japanese
Replaces <br clear="all" /> calls with <br class="clearall" /> on the admin to comply with HTML5.
Removes <br clear="all" /> calls on themes for HTML5 as well.
fix trimming of setup files

seems trim with a parameter does not strip off new line characters