Merge remote-tracking branch 'upstream/master'
There seems to be problems with encoding - this should fix it.
The GUID in the link to the items has to be encoded, since it could contain special characters
bb2diaspora: added one more page break. In the future it could be replaced by a regular expression.
Merge pull request #1069 from annando/master

Solved (possible) encoding problem, encoding of URLs with GUID