From: nodiscc <nodiscc@gmail.com>
Date: Sun, 15 Mar 2015 13:21:33 +0000 (+0100)
Subject: Merge branch 'include-doc' into next
X-Git-Tag: v0.0.44beta~4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=bc66d513a9aa6da9361dbfc2f0b4bf384e9597a6;hp=-c;p=github%2Fshaarli%2FShaarli.git

Merge branch 'include-doc' into next
---

bc66d513a9aa6da9361dbfc2f0b4bf384e9597a6