....
authorpierre <pierre@MacBook-Pro-de-Lerass.local>
Wed, 19 Nov 2014 23:43:05 +0000 (00:43 +0100)
committerpierre <pierre@MacBook-Pro-de-Lerass.local>
Wed, 19 Nov 2014 23:43:05 +0000 (00:43 +0100)
Merge branch 'master' of http://www.iramuteq.org/git/iramuteq


Trivial merge