Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
authorpierre <pierre@MacBook-Pro-de-Lerass.local>
Fri, 5 Dec 2014 18:18:57 +0000 (19:18 +0100)
committerpierre <pierre@MacBook-Pro-de-Lerass.local>
Fri, 5 Dec 2014 18:18:57 +0000 (19:18 +0100)

Trivial merge