Merge remote-tracking branch 'ArthurHoaro/autocomplete' into next

author nodiscc <nodiscc@gmail.com>

Sun, 15 Mar 2015 13:21:59 +0000 (14:21 +0100)

committer nodiscc <nodiscc@gmail.com>

Sun, 15 Mar 2015 13:21:59 +0000 (14:21 +0100)
author nodiscc <nodiscc@gmail.com>
Sun, 15 Mar 2015 13:21:59 +0000 (14:21 +0100)
committer nodiscc <nodiscc@gmail.com>
Sun, 15 Mar 2015 13:21:59 +0000 (14:21 +0100)
diff --cc COPYING
Simple merge
diff --cc inc/shaarli.css
Simple merge
diff --cc index.php
Simple merge
author	nodiscc <nodiscc@gmail.com>
	Sun, 15 Mar 2015 13:21:59 +0000 (14:21 +0100)
committer	nodiscc <nodiscc@gmail.com>
	Sun, 15 Mar 2015 13:21:59 +0000 (14:21 +0100)
		1	2
COPYING	patch \|	diff1 \|	diff2 \|	blob \| history
inc/shaarli.css	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history