diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-03-28 23:29:24 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-03-28 23:29:24 +0100 |
commit | 211d4f0231ecc967bea385e3bed637aaff3d0fc5 (patch) | |
tree | 6bfc65c4441383338a85b2900501eb4da8285e8c /user | |
parent | de5e67741f8e5926a4327d24b73b1a851e5539aa (diff) | |
parent | 7c90e65e25f673a9c621c6102ee3d7c130160b01 (diff) | |
download | web-211d4f0231ecc967bea385e3bed637aaff3d0fc5.tar.gz web-211d4f0231ecc967bea385e3bed637aaff3d0fc5.tar.bz2 web-211d4f0231ecc967bea385e3bed637aaff3d0fc5.zip |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/web
Conflicts:
faq/issues/got_a_db_prompt.mdwn
Diffstat (limited to 'user')
-rw-r--r-- | user/musial.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user/musial.mdwn b/user/musial.mdwn index 271fc3cb..2235e492 100644 --- a/user/musial.mdwn +++ b/user/musial.mdwn @@ -12,6 +12,6 @@ License|/fdl]]."]]"""]] email: musial at gnu dot org -http://musial.tangent.cc +http://musial.musialx.com Join the FSF! - http://www.fsf.org/register_form?referrer=9143 |