From: Jérôme <mojo@couak.net>
Date: Tue, 14 Jul 2015 20:32:08 +0000 (+0000)
Subject: Merge branch 'text-files' into 'master'
X-Git-Tag: 1.1~48
X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/7d882259839e1c6975a86f381436cfcbac41c374?hp=fc656c4e3959d274dadb807b4518720f91df079f

Merge branch 'text-files' into 'master'

Minor changes to text files

See merge request !5
---