Merge branch 'master' into remotefork

[phorkie.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4a9cfc5d7be6c5e0b44f18ba7ce884a8b779adf9..51548c25c3bb841b904d822ffb079fc4193e9d9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-19  Christian Weiske  <cweiske@cweiske.de>
+
+       * Implement request #12: add link rel="vcs-git"
+
+2012-09-18  Justin J. Novack  <jnovack@gmail.com>
+
+       * Add Markdown as a known file-type.
+
 2012-09-17  Justin J. Novack <jnovack@gmail.com>
 
        * Add OpenID authentication