[SCM] Web pages branch, master, updated. 9265ccb82e9ed45c69efd3781cd2bcf77c85cf15

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Web pages".

The branch, master has been updated
       via  9265ccb82e9ed45c69efd3781cd2bcf77c85cf15 (commit)
       via  084019007a8bfd9d7d5ad1563bd146e1bb24bc87 (commit)
       via  d586f3610dc8994669af500102e167bb2e56c672 (commit)
       via  59683bc78288d1975e951a17c663eb97ebefe73a (commit)
      from  a37cdc314b593905af298d3a78b77ff6faff919e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9265ccb82e9ed45c69efd3781cd2bcf77c85cf15
Merge: a37cdc3 0840190
Author: Samuel Thibault <address@hidden>
Date:   Mon Feb 1 17:47:51 2016 +0100

    Merge branch 'master' of braunbox:~hurd-web/hurd-web

commit 084019007a8bfd9d7d5ad1563bd146e1bb24bc87
Author: Thomas Schwinge <address@hidden>
Date:   Mon Jan 11 16:42:38 2016 +0100

    darnassus: sthttpd (thttpd) instead of apache2

commit d586f3610dc8994669af500102e167bb2e56c672
Author: https://launchpad.net/~tschwinge <address@hidden>
Date:   Mon Jan 11 16:25:35 2016 +0100

    FOSDEM 2016

commit 59683bc78288d1975e951a17c663eb97ebefe73a
Author: tschwinge <address@hidden>
Date:   Mon Jan 11 16:05:22 2016 +0100

    address@hidden

-----------------------------------------------------------------------

Summary of changes:
 community/meetings.mdwn                       |    4 +++-
 community/meetings/fosdem_2016.mdwn           |    1 +
 ikiwiki.setup                                 |    7 +++++--
 public_hurd_boxen/installation/darnassus.mdwn |   19 ++++---------------
 4 files changed, 13 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Web pages