Merge branch 'master' of auder.net:valse
authoremilie <emilie@devijver.org>
Thu, 16 Mar 2017 16:56:06 +0000 (17:56 +0100)
committeremilie <emilie@devijver.org>
Thu, 16 Mar 2017 16:56:06 +0000 (17:56 +0100)
# Conflicts:
# pkg/R/selectiontotale.R


Trivial merge