Merge latest commits from mojombo/jekyll

History.markdown

@@ -8,6 +8,7 @@
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
 
 ### Site Enhancements
+  * Add link to jekyll-minibundle in the doc's plugins list (#1035)
   * Quick patch for importers documentation
   * Fix prefix for WordpressDotCom importer in docs (#1107)
   * Add jekyll-contentblocks plugin to docs (#1068)

jekyll.gemspec

@@ -92,13 +92,14 @@ Gem::Specification.new do |s|
     lib/jekyll/generator.rb
     lib/jekyll/generators/pagination.rb
     lib/jekyll/layout.rb
-    lib/jekyll/logger.rb
     lib/jekyll/mime.types
     lib/jekyll/page.rb
     lib/jekyll/plugin.rb
     lib/jekyll/post.rb
+    lib/jekyll/related_posts.rb
     lib/jekyll/site.rb
     lib/jekyll/static_file.rb
+    lib/jekyll/stevenson.rb
     lib/jekyll/tags/gist.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
@@ -235,6 +236,7 @@ Gem::Specification.new do |s|
     test/test_rdiscount.rb
     test/test_redcarpet.rb
     test/test_redcloth.rb
+    test/test_related_posts.rb
     test/test_site.rb
     test/test_tags.rb
   ]

site/docs/plugins.md

@@ -427,6 +427,7 @@ There are a few useful, prebuilt plugins at the following locations:
 - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML (\*.html) and JavaScript(\*.js) files when output.
 - [smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics. [Demo](http://saswatpadhi.github.com/)
 - [excerpts](http://blog.darkrefraction.com/2012/jekyll-excerpt-plugin.html) by [drawoc](https://github.com/drawoc): provides a nice way to implement page excerpts.
+- [jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice, no gem dependencies.
 
 <div class="note info">
   <h5>Jekyll Plugins Wanted</h5>