[www] branch stable updated (4e2a7b7 -> e83fbd8)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch stable
in repository www.

    from 4e2a7b7  remove duplicate
     add e83fbd8  merge android

No new revisions were added by this update.

Summary of changes:
 template/gsoc.html.j2 | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index 7a380e1..ce89160 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -119,7 +119,14 @@
         </p>
         <p>
           {% trans %}
-            <strong>Mentors:</strong> <a 
href="https://www.goebel-consult.de/";>Hartmut Goebel</a>
+            Includes: Implementation of rudimentary Android compatibility for 
GNUnet,
+            in part by porting the GNUnet utils scheduler to act as
+            a thin wrapper over libuv.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> <a 
href="https://www.goebel-consult.de/";>Hartmut Goebel</a>, Jeff Burdges, 
Christian Grothoff
           {% endtrans %}
         </p>
       </section>
@@ -260,21 +267,6 @@
           {% endtrans %}
         </p>
       </section>
-      <section>
-        <h4>Android compatibility for GNUnet</h4>
-        <p>
-          {% trans %}
-            Implement rudimentary Android compatibility for GNUnet,
-            in part by porting the GNUnet utils scheduler to act as
-            a thin wrapper over libuv.
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            <strong>Mentors:</strong> Jeff Burdges and Christian Grothoff
-          {% endtrans %}
-        </p>
-      </section>
       <section>
         <h4>Implementation of a replacement for PANDA</h4>
         <p>

-- 
To stop receiving notification emails like this one, please contact
address@hidden.