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)
commit77fde6fc68ce70ca07a371be4511993d5516085d
tree658f7b7669bf2472df28dc6023bb7612d8dc69a1
parent25f737999f505619008eeaa0a35eac1e34a52d5b
parentbb55112483c7e4beede77363b9838eaf347f5116
Merge branch 'master' of auder.net:valse

# Conflicts:
# pkg/R/selectiontotale.R