Peter Korsgaard 7353967690 Merge branch 'next' ... Quite some conflicts, so here goes .. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>		2016-09-02 16:20:33 +02:00
..
conf
manual	Merge branch 'next'	2016-09-02 16:20:33 +02:00
website
images