From: emilie <emilie@devijver.org>
Date: Thu, 16 Mar 2017 16:56:06 +0000 (+0100)
Subject: Merge branch 'master' of auder.net:valse
X-Git-Url: https://git.auder.net/%7B%7B%20path%28%27mixstore_store_package_view%27%2C%20%7B%20id:%20newsItem.id%20%7D%29%20%7D%7D?a=commitdiff_plain;h=77fde6fc68ce70ca07a371be4511993d5516085d;p=valse.git

Merge branch 'master' of auder.net:valse

# Conflicts:
#	pkg/R/selectiontotale.R
---

77fde6fc68ce70ca07a371be4511993d5516085d