Merge branch 'gh-pages' of git://github.com/chiuki/waaa into gh-pages

Conflicts: _posts/2012-06-23-public-speaking-office-hours.md
janl · Jun 25, 2012 · e570d75 · e570d75
2 parents ada992d + d192135
commit e570d75
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/_posts/2012-06-23-public-speaking-office-hours.md b/_posts/2012-06-23-public-speaking-office-hours.md
@@ -25,3 +25,5 @@ outside office hours.
 
 * Chiu-Ki Chan, [@chiuki](http://twitter.com/chiuki)
 * Tiffany Conroy, [@theophani](http://twitter.com/theophani)
+* Lorna Mitchell, [@lornajane](http://twitter.com/lornajane)
+* Estelle Weyl, [@estellevw](http://twitter.com/estellevw)