update changelog

dakrone · Jun 15, 2012 · 27299eb · 27299eb
1 parent 0d4bc97
commit 27299eb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/changelog.org b/changelog.org
@@ -153,6 +153,9 @@
 * Work log
   Log of merges/issues/work that's gone in so I know what to put in
   the changelog for the next release
+** 2012-06-15
+   - merged https://github.com/dakrone/clj-http/pull/80 to allow
+     specifying the keystore type
 ** 2012-06-13
    - merged https://github.com/dakrone/clj-http/pull/79 to allow
      pluggable output coercion (multimethod)