[reproducible-website] 04/04: Merge branch 'master' of ssh://git.debian.org/git/reproducible/reproducible-website

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch master
in repository reproducible-website.

commit 24ef4f875aade1d35a4e622cdb501d6982d959e1
Merge: 15c9889 68dd997
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Dec 14 18:02:24 2016 +0100

    Merge branch 'master' of ssh://git.debian.org/git/reproducible/reproducible-website

 _data/projects.yml      | 12 ++++++++++--
 _events/berlin2016.html |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reproducible-website.git