<newsletter:master> Merge branch 'master' of git+ssh://git.geany.org/git/newsletter

[Dominic Hopf]

Updating branch refs/heads/master
         to 92998a79018b2d6245b224660f28c3321bc1196e (commit)
       from d5ce1971911d6149824687c302758cb346f58c41 (commit)

commit 92998a79018b2d6245b224660f28c3321bc1196e
Merge: d5ce197 e5985cc
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Thu Mar 24 23:30:25 2011 +0100

    Merge branch 'master' of git+ssh://git.geany.org/git/newsletter

commit e5985ccf2dd02d581964e2049300f2fbe93d9e76
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Thu Mar 24 23:07:25 2011 +0100

    Move topic collection into source file for newsletter issue 2

 vol_2/newsletter_2.rst     |    9 +++++++++
 vol_2/topic_collection.txt |    7 -------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/vol_2/newsletter_2.rst b/vol_2/newsletter_2.rst
index b8c9dee..b1a2ab0 100644
--- a/vol_2/newsletter_2.rst
+++ b/vol_2/newsletter_2.rst
@@ -1,10 +1,19 @@
 Geany Newsletter #2
 -------------------
 
+
+About Geany
+===========
+
+
 Geany Universe
 ==============
 
 
+People behind Geany -- Interview
+=================================
+
+
 Geany local
 ===========
 
diff --git a/vol_2/topic_collection.txt b/vol_2/topic_collection.txt
deleted file mode 100644
index 4782613..0000000
--- a/vol_2/topic_collection.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Topic collection for issue II
-target date: 2nd Sunday in April (2011-04-10)
-
-* Small teaser text for pdf/html version which is describing Geany a
-  bit (reader's feedback via mail)
-* Interview with some developer/contributor to Geany
-* Geany at Chemnitzer Linuxtage