Added json_encode implementation for php<5.2
RSS/Atom: add a parameter to print only the N last links
Corrected error message for lack of write access in ./data
Smaller logo file

Better PNG compression of logo file, as produced by Page Speed.
Ajout d’un UA lors de la récupération d’une page externe (certains site veulent un UA)
Added the possibility to put a description in the bookmarklet's URL
Import NETSCAPE-Bookmark compatible milliseconds

NETSCAPE-Bookmark sometimes contains dates as milliseconds instead of
seconds.
For instance, this is the case of the files gererated for Google +1s by
Google Takeout.
This patch make these files compatible.
Merge pull request #122 from lehollandaisvolant/master

Ajout d’un UA lors de la récupération d’une page externe
Merge pull request #126 from Alkarex/Milliseconds

Import: add compatibility for milliseconds in NETSCAPE-Bookmark
Merge pull request #125 from broncowdd/master

Added the possibility to put a description in the bookmarklet's URL
Merge pull request #119 from Alkarex/master

Smaller logo file
Merge pull request #118 from Alkarex/patch-1

Corrected error message for lack of write access in ./data
Merge pull request #112 from BoboTiG/master

RSS/Atom: add a parameter to print only the N last links
Added tags+private in shaarli URL

Manually merged pull request https://github.com/sebsauvage/Shaarli/pull/99
Merge pull request #87 from LionelMartin/3385af123f6b4dfc59aeaa69f180381307b64368

Added a json_encode implementation for PHP < 5.2 (free.fr)
Merge branch 'master' of git://github.com/sebsauvage/Shaarli
Merge branch 'master' into myShaarli

Conflicts:
	index.php