From: Galen Charlton <gmcharlt@gmail.com>
Date: Sat, 28 Apr 2012 02:25:41 +0000 (-0400)
Subject: include GSOC and stats slides and tweaks
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=25d12200b85924eeade8dc94a1f1a1132c10edda;p=working%2Frandom.git

include GSOC and stats slides and tweaks

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/GSOC.txt b/GSOC.txt
index 8a72eefe1..9a8cd43c9 100644
--- a/GSOC.txt
+++ b/GSOC.txt
@@ -1,23 +1,26 @@
 Google Summer of Code students
-==============================
+------------------------------
 
 Daniel Rizea
-------------
+~~~~~~~~~~~~
 * *Project*: Create Android client(s) for Evergreen
 * *Mentor*: Dan Wells
 
 Joseph Lewis
-------------
+~~~~~~~~~~~~
 * *Project*: Upgrade Dojo to bring Evergreen to the modern web
 * *Mentor*: Tom Berezansky
 
+Google Summer of Code students 2
+-------------------------------- 
+
 Pranjal Prabhash
-----------------
+~~~~~~~~~~~~~~~~
 * *Project*: Create a PHP client for OpenSRF and Evergreen
 * *Mentor*: Lebbeous Fogle-Weekley
 
 Swenyu Duan
------------
+~~~~~~~~~~~
 * *Project*: Optimize Evergreen: Convert PL/Perl-based PostgreSQL stored procedures to PL/SQL or PL/C
 * *Mentor*: Mike Rylander
 
diff --git a/egconf12_dev_update.txt b/egconf12_dev_update.txt
index 0f4023434..c2feb22f5 100644
--- a/egconf12_dev_update.txt
+++ b/egconf12_dev_update.txt
@@ -7,14 +7,19 @@ Developer's update -- Evergreen Conference 2012
 Overview
 --------
 
+- What we've done, by the numbers
+- Google Summer of Code
 - RM & RMaints
 - Evergreen 2.3
 - Path to Evergreen 2.2.0
 - Evergreen 2.1.x
-- Google Summer of Code
 - What's in 2.2.0
 - The future
 
+include::stats.txt[]
+include::GSOC.txt[]
+
+
 Releases
 --------
 
diff --git a/stats.txt b/stats.txt
index 224415c43..eb67f7803 100644
--- a/stats.txt
+++ b/stats.txt
@@ -1,5 +1,5 @@
 Development statistics redux
-============================
+----------------------------
 
 No cool visualization this time!