Permalink
Browse files

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

Conflicts:
	_posts/2012-06-23-public-speaking-office-hours.md
  • Loading branch information...
2 parents ada992d + d192135 commit e570d75648f4b4a68520afdb45852d92532a03b5 @theophani theophani committed Jun 25, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 _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)

0 comments on commit e570d75

Please sign in to comment.