diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2012-03-18 11:16:19 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2012-03-18 11:16:19 +0100 |
| commit | 1a6198f817bd82e3b1621e9744cd40a453480318 (patch) | |
| tree | 31344362cebea089ffbcd183fbd4453acf7f80f7 /contributing | |
| parent | 4cd1d75e21651b04ee8becd5fbff1f4193ed1841 (diff) | |
| parent | d9ab0c14d998bd33fb321c84e8e1de751fc1990b (diff) | |
Merge remote-tracking branch 'flubber/master'
Conflicts:
contributing/web_pages/news/moth_next.mdwn
Diffstat (limited to 'contributing')
| -rw-r--r-- | contributing/web_pages/news/moth_next.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contributing/web_pages/news/moth_next.mdwn b/contributing/web_pages/news/moth_next.mdwn index 1d9ca9ce..65992517 100644 --- a/contributing/web_pages/news/moth_next.mdwn +++ b/contributing/web_pages/news/moth_next.mdwn @@ -124,7 +124,7 @@ additional contact point and a forum for discussion and staying in touch. <!-- -As a final note, we want to share a story about real-life debugging with the +Now, as a final note, we want to share a story about real-life debugging with the Hurd; IRC, freenode, #hurd, 2012-03-02: <youpi> yay GNU/Hurd |