[SCM] Web pages branch, master, updated. 211d4f0231ecc967bea385e3bed637aaff3d0fc5

[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  211d4f0231ecc967bea385e3bed637aaff3d0fc5 (commit)
       via  de5e67741f8e5926a4327d24b73b1a851e5539aa (commit)
      from  7c90e65e25f673a9c621c6102ee3d7c130160b01 (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 211d4f0231ecc967bea385e3bed637aaff3d0fc5
Merge: de5e677 7c90e65
Author: Samuel Thibault <address@hidden>
Date:   Thu Mar 28 23:29:24 2013 +0100

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/web
    
    Conflicts:
        faq/issues/got_a_db_prompt.mdwn

commit de5e67741f8e5926a4327d24b73b1a851e5539aa
Author: Samuel Thibault <address@hidden>
Date:   Thu Mar 28 23:28:36 2013 +0100

    tell to provide the whole content, not just the address

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

Summary of changes:
 faq/issues/got_a_db_prompt.mdwn |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Web pages