Merge with updates from cweiske/master
authorJustin J. Novack <jnovack@gmail.com>
Mon, 17 Sep 2012 14:08:39 +0000 (10:08 -0400)
committerJustin J. Novack <jnovack@gmail.com>
Mon, 17 Sep 2012 14:08:39 +0000 (10:08 -0400)
1  2 
ChangeLog
src/phorkie/Repository.php
www/.htaccess

diff --cc 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
Simple merge
diff --cc www/.htaccess
Simple merge