diff options
author | Thomas Schwinge <thomas@schwinge.name> | 2010-03-28 21:48:46 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@schwinge.name> | 2010-03-28 21:48:46 +0200 |
commit | 4b35fc7bdd7ab723cb3db8e9122ed08d996f33b4 (patch) | |
tree | e4bb2ffadd136ab05b8abc3c0fa9f305f8c360fe /news/2010-03-31.mdwn | |
parent | 34794c7002f679ab9c2d076284ff58288224c47d (diff) | |
parent | 96611f76b833159bafeab3443229dfa690178d92 (diff) |
Merge commit '96611f76b833159bafeab3443229dfa690178d92' into master-news_next
Conflicts:
news/2010-03-31.mdwn
Diffstat (limited to 'news/2010-03-31.mdwn')
-rw-r--r-- | news/2010-03-31.mdwn | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/news/2010-03-31.mdwn b/news/2010-03-31.mdwn index f3e67634..758420fb 100644 --- a/news/2010-03-31.mdwn +++ b/news/2010-03-31.mdwn @@ -19,13 +19,13 @@ else="[[!paste id=full_news]]"]] [[!cut id="full_news" text=""" > This month saw bugs dieing as they met hackers like -> [Jérémie, Antrik, Samuel](http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00027.html), +> [Jérémie, Samuel](http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00027.html), > [Da Zheng, Thomas](http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00051.html) and > [Jakub](http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00071.html), > (keeping it to the ones which were discussed in the -> [[mailing_list|mailing_lists.html#bug-hurd]]). +> [[mailing_list|mailing_lists#bug-hurd]]). > -> Also Antrik, Thomas and Cfhammar [wrote](http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00022.html) +> Also antrik, Thomas and Cfhammar [wrote](http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00022.html) > our [[application|community/gsoc/organization_application]] > for the Google Summer of Code 2010, but Google is > [asking most GNU projects to work under the GNU project umbrella](http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00125.html), @@ -33,8 +33,8 @@ else="[[!paste id=full_news]]"]] > > This means: You can apply for any of the ideas on our > [[Hurd_ideas_for_GSoC_2010|community/gsoc/project_ideas]] page via the -> [GNU project GSoC page](http://socghop.appspot.com/gsoc/org/show/google/gsoc2010/gnuproject). If you apply, please also incluye the information from our ->> [[student_application_form|community/gsoc/student_application_form]]. +> [GNU project GSoC page](http://socghop.appspot.com/gsoc/org/show/google/gsoc2010/gnuproject). If you apply, please also include the information from our +> [[student_application_form|community/gsoc/student_application_form]]. We’re anxious to see your applications! > """]] |