From: Justin J. Novack <jnovack@gmail.com>
Date: Mon, 17 Sep 2012 14:08:39 +0000 (-0400)
Subject: Merge with updates from cweiske/master
X-Git-Tag: v0.3.0~42^2~45
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/97c4ac59eed8b66b2e7f85d8ac325b063fb8a0ce

Merge with updates from cweiske/master
---

97c4ac59eed8b66b2e7f85d8ac325b063fb8a0ce
diff --cc ChangeLog
index 35e7456,afefa9a..4a9cfc5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
- 2012-09-16  Justin J. Novack <jnovack@gmail.com>
++2012-09-17  Justin J. Novack <jnovack@gmail.com>
 +
 +	* Add OpenID authentication
 +
+ 2012-09-16  Christian Weiske  <cweiske@cweiske.de>
+ 
+ 	* Implement request #12: DOAP documents for all pastes
+ 
  2012-09-08  Christian Weiske  <cweiske@cweiske.de>
  
  	* Fix bug #11: do not index edit, delete and tool pages