8bf55ef8fa 
								
							 
						 
						
							
							
								
								Merge pull request  #928  from danieldriver/ordinal_date  
							
							... 
							
							
							
							add ordinal date permalink style (/YYYY/DDD/slug.html) 
							
						 
						
							2013-04-07 13:52:30 -07:00  
				
					
						
							
							
								 
						
							
								0f2c9d29ee 
								
							 
						 
						
							
							
								
								Merge pull request  #875  from mojombo/posts-cant-be-dirs  
							
							... 
							
							
							
							Directories with valid post names should be filtered out 
							
						 
						
							2013-04-07 12:54:42 -07:00  
				
					
						
							
							
								 
						
							
								7b36d26240 
								
							 
						 
						
							
							
								
								Merge pull request  #892  from rafaelrosafu/master  
							
							... 
							
							
							
							Added date_to_rfc822 used on RSS feeds 
							
						 
						
							2013-04-07 12:43:50 -07:00  
				
					
						
							
							
								 
						
							
								ea753130e6 
								
							 
						 
						
							
							
								
								add ordinal date permalink style (/YYYY/DDD/slug.html)  
							
							
							
						 
						
							2013-04-06 08:17:02 -04:00  
				
					
						
							
							
								 
						
							
								483a0b68b6 
								
							 
						 
						
							
							
								
								Merge pull request  #890  from zachgersh/abbreviated_month  
							
							... 
							
							
							
							Added abbreviated month + test. 
							
						 
						
							2013-04-05 09:44:50 -07:00  
				
					
						
							
							
								 
						
							
								571bdd686c 
								
							 
						 
						
							
							
								
								Move tests for symlinked files to separate test cases  
							
							
							
						 
						
							2013-04-01 12:02:15 +02:00  
				
					
						
							
							
								 
						
							
								0bebe0f31c 
								
							 
						 
						
							
							
								
								Add test for processing of symlinked static files and pages  
							
							
							
						 
						
							2013-03-31 20:20:15 +02:00  
				
					
						
							
							
								 
						
							
								7879d2e02c 
								
							 
						 
						
							
							
								
								Fixed expected output from xmlschema and rfc822  
							
							
							
						 
						
							2013-03-29 01:07:47 -04:00  
				
					
						
							
							
								 
						
							
								e931414b77 
								
							 
						 
						
							
							
								
								Changed to short_month and re-ran tests.  
							
							
							
						 
						
							2013-03-27 08:40:58 -07:00  
				
					
						
							
							
								 
						
							
								186b68adb0 
								
							 
						 
						
							
							
								
								Added filter date_to_rfc822  
							
							... 
							
							
							
							According to the W3C RSS Feed Validator, feeds must format dates as described
on RFC-822 to be valid. Refer to their site to get more info:
http://feedvalidator.org/docs/error/InvalidRFC2822Date.html 
I also added a couple of missing unit tests to the other date filters 
							
						 
						
							2013-03-27 02:21:48 -04:00  
				
					
						
							
							
								 
						
							
								6657f2add9 
								
							 
						 
						
							
							
								
								Added abbreviated month + test.  
							
							
							
						 
						
							2013-03-26 23:06:34 -07:00  
				
					
						
							
							
								 
						
							
								8f890cb064 
								
							 
						 
						
							
							
								
								Fix tests that fail due to having a directory that looks like a post  
							
							
							
						 
						
							2013-03-19 21:59:43 +01:00  
				
					
						
							
							
								 
						
							
								a054ce2788 
								
							 
						 
						
							
							
								
								Merge pull request  #861  from danielgrieve/gist-tag  
							
							... 
							
							
							
							display single files from gist 
							
						 
						
							2013-03-17 13:33:10 -07:00  
				
					
						
							
							
								 
						
							
								0765d07730 
								
							 
						 
						
							
							
								
								Added sanity tests for  #869 .  
							
							
							
						 
						
							2013-03-17 21:15:17 +01:00  
				
					
						
							
							
								 
						
							
								6c1a08ce87 
								
							 
						 
						
							
							
								
								Merge pull request  #862  from mojombo/fix-autogen-dest-prob  
							
							... 
							
							
							
							Stop DirectoryWatcher from watching the destination directory 
							
						 
						
							2013-03-17 12:48:30 -07:00  
				
					
						
							
							
								 
						
							
								936ed1f849 
								
							 
						 
						
							
							
								
								Merge pull request  #837  from ixti/feature-excerpt  
							
							... 
							
							
							
							Adds excerpt to posts 
							
						 
						
							2013-03-17 07:53:41 -07:00  
				
					
						
							
							
								 
						
							
								aa7a234c18 
								
							 
						 
						
							
							
								
								Merge master into jekyll-new  
							
							
							
						 
						
							2013-03-17 15:45:37 +01:00  
				
					
						
							
							
								 
						
							
								5d34a4c533 
								
							 
						 
						
							
							
								
								Merge pull request  #864  from mojombo/prioritize_plugins  
							
							... 
							
							
							
							Prioritize plugins & DRY subclass instantiation 
							
						 
						
							2013-03-16 12:09:43 -07:00  
				
					
						
							
							
								 
						
							
								d091cfe3fc 
								
							 
						 
						
							
							
								
								Merge pull request  #863  from mojombo/accept-custom-config  
							
							... 
							
							
							
							Accept custom configuration 
							
						 
						
							2013-03-16 12:07:31 -07:00  
				
					
						
							
							
								 
						
							
								39f144ed01 
								
							 
						 
						
							
							
								
								Newline.  
							
							
							
						 
						
							2013-03-16 20:06:50 +01:00  
				
					
						
							
							
								 
						
							
								1d05e0be81 
								
							 
						 
						
							
							
								
								Added tests for generators.  
							
							
							
						 
						
							2013-03-16 20:06:40 +01:00  
				
					
						
							
							
								 
						
							
								7425b2c32e 
								
							 
						 
						
							
							
								
								Add test to ensure plugins are executed in order of priority.  
							
							
							
						 
						
							2013-03-16 15:12:57 +01:00  
				
					
						
							
							
								 
						
							
								9100967ebd 
								
							 
						 
						
							
							
								
								Add unit tests for custom configuration.  
							
							
							
						 
						
							2013-03-16 14:46:26 +01:00  
				
					
						
							
							
								 
						
							
								52efb71aa2 
								
							 
						 
						
							
							
								
								Added directory_with_contents() to DRY up test code and ensure folders exist in TestCommand.  
							
							
							
						 
						
							2013-03-16 14:09:53 +01:00  
				
					
						
							
							
								 
						
							
								d93faac3b8 
								
							 
						 
						
							
							
								
								Rudimentary tests for Jekyll::Command  
							
							
							
						 
						
							2013-03-16 13:59:59 +01:00  
				
					
						
							
							
								 
						
							
								a0c0d983bf 
								
							 
						 
						
							
							
								
								Using a test_dir helper method for tests.  
							
							
							
						 
						
							2013-03-16 13:59:40 +01:00  
				
					
						
							
							
								 
						
							
								92d9c4301b 
								
							 
						 
						
							
							
								
								display single files from gist  
							
							
							
						 
						
							2013-03-15 22:37:14 +00:00  
				
					
						
							
							
								 
						
							
								4be5dfdb9a 
								
							 
						 
						
							
							
								
								fix copying of site template files  
							
							
							
						 
						
							2013-03-13 21:27:41 +00:00  
				
					
						
							
							
								 
						
							
								1ab83ff9e9 
								
							 
						 
						
							
							
								
								fix test to highlight issue with FileUtils.cp_r  
							
							
							
						 
						
							2013-03-13 19:55:15 +00:00  
				
					
						
							
							
								 
						
							
								b306835ce0 
								
							 
						 
						
							
							
								
								Add tests for 'new' command.  
							
							
							
						 
						
							2013-03-12 19:38:05 +01:00  
				
					
						
							
							
								 
						
							
								725b127f9b 
								
							 
						 
						
							
							
								
								Merge pull request  #536  from fotos/fix_page_dir  
							
							... 
							
							
							
							Added path in url. 
							
						 
						
							2013-03-09 17:07:16 -08:00  
				
					
						
							
							
								 
						
							
								22dcc4e20f 
								
							 
						 
						
							
							
								
								Adds excerpt to posts  
							
							
							
						 
						
							2013-03-04 17:13:25 +01:00  
				
					
						
							
							
								 
						
							
								17c875f6f5 
								
							 
						 
						
							
							
								
								Fixed plugin test error.  
							
							
							
						 
						
							2013-03-02 18:51:42 +01:00  
				
					
						
							
							
								 
						
							
								441eddf1ca 
								
							 
						 
						
							
							
								
								Fix pretty url style paths.  
							
							... 
							
							
							
							Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case. 
							
						 
						
							2013-02-28 03:49:39 +02:00  
				
					
						
							
							
								 
						
							
								63d0eef646 
								
							 
						 
						
							
							
								
								Merge pull request  #824  from sinamt/symlinked_folders  
							
							... 
							
							
							
							Allow symlinked folders in unsafe mode (with tests). Closes  #796 , resolves  #233 . 
							
						 
						
							2013-02-26 16:54:52 -08:00  
				
					
						
							
							
								 
						
							
								849c34e913 
								
							 
						 
						
							
							
								
								Add tests for filtering symlink entries when safe mode enabled  
							
							
							
						 
						
							2013-02-27 10:39:46 +11:00  
				
					
						
							
							
								 
						
							
								d58859570d 
								
							 
						 
						
							
							
								
								Fix up the whitespace.  
							
							... 
							
							
							
							Remove an extra blank line and fix another whitespace error pointed out
by git diff 
							
						 
						
							2013-02-25 13:24:37 -06:00  
				
					
						
							
							
								 
						
							
								ffc42310b4 
								
							 
						 
						
							
							
								
								Add back a test that was mistakenly removed.  
							
							
							
						 
						
							2013-02-25 13:19:45 -06:00  
				
					
						
							
							
								 
						
							
								d2c79a8841 
								
							 
						 
						
							
							
								
								Merge branch 'master' into issue-653  
							
							
							
						 
						
							2013-02-25 13:08:23 -06:00  
				
					
						
							
							
								 
						
							
								f8a90d711f 
								
							 
						 
						
							
							
								
								Using https protocol instead of http.  
							
							
							
						 
						
							2013-02-24 01:54:13 +01:00  
				
					
						
							
							
								 
						
							
								cdd3c0ef0c 
								
							 
						 
						
							
							
								
								Remove 'type' attribute from script tag in gist liquid tag.  
							
							
							
						 
						
							2013-02-24 01:30:41 +01:00  
				
					
						
							
							
								 
						
							
								7e7cee6e56 
								
							 
						 
						
							
							
								
								Strip space from the gist number, add test for gist tag  
							
							
							
						 
						
							2013-02-24 00:58:13 +01:00  
				
					
						
							
							
								 
						
							
								a19bb1815a 
								
							 
						 
						
							
							
								
								Fixed merge conflicts in test/test_configuration.rb  
							
							
							
						 
						
							2013-02-20 23:13:06 +01:00  
				
					
						
							
							
								 
						
							
								c7c0a9432c 
								
							 
						 
						
							
							
								
								Updating tests for safe_yaml.  
							
							
							
						 
						
							2013-02-10 19:09:36 +01:00  
				
					
						
							
							
								 
						
							
								9bb0bfc0b2 
								
							 
						 
						
							
							
								
								Eliminating migrator tests (in this repo).  
							
							
							
						 
						
							2013-01-31 01:19:56 +01:00  
				
					
						
							
							
								 
						
							
								2e73671cf4 
								
							 
						 
						
							
							
								
								Updated Kramdown tests to reflect numeral HTML entities.  
							
							
							
						 
						
							2013-01-30 23:25:49 +01:00  
				
					
						
							
							
								 
						
							
								04b60ffe7f 
								
							 
						 
						
							
							
								
								Merge pusewicz/bump-gems from  #744  
							
							
							
						 
						
							2013-01-30 23:20:23 +01:00  
				
					
						
							
							
								 
						
							
								b4bea4a586 
								
							 
						 
						
							
							
								
								Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup  
							
							... 
							
							
							
							Module Cleanup
* 'code-cleanup' of git://github.com/tombell/jekyll:
  Remove new lines between module and class
  Update tag classes moving into a module
  Update pagination classes moving into a module
  Update converter classes moving into a module
  Strip extra newlines
  Update command classes moving into a module
Conflicts:
	lib/jekyll/commands/serve.rb 
							
						 
						
							2013-01-27 23:13:16 +01:00  
				
					
						
							
							
								 
						
							
								409eedafd8 
								
							 
						 
						
							
							
								
								Merge pull request  #767  from mojombo/string-categories  
							
							... 
							
							
							
							Force Categories to be Strings 
							
						 
						
							2013-01-26 13:32:26 -08:00  
				
					
						
							
							
								 
						
							
								d82179048e 
								
							 
						 
						
							
							
								
								adding files  
							
							
							
						 
						
							2013-01-23 11:31:59 -06:00  
				
					
						
							
							
								 
						
							
								1528cfe1cd 
								
							 
						 
						
							
							
								
								adding safe_yaml to protect against object instantiation from yaml  
							
							
							
						 
						
							2013-01-23 11:30:24 -06:00  
				
					
						
							
							
								 
						
							
								607b4c84fd 
								
							 
						 
						
							
							
								
								Only running simplecov if RUBY_VERSION is 1.9 or greater, and COVERAGE env is set to 'true'  
							
							
							
						 
						
							2013-01-20 22:16:23 -05:00  
				
					
						
							
							
								 
						
							
								2c45150545 
								
							 
						 
						
							
							
								
								Update tag classes moving into a module  
							
							
							
						 
						
							2013-01-19 23:50:44 +00:00  
				
					
						
							
							
								 
						
							
								663a1321d2 
								
							 
						 
						
							
							
								
								Update converter classes moving into a module  
							
							
							
						 
						
							2013-01-19 23:07:38 +00:00  
				
					
						
							
							
								 
						
							
								f231ef7644 
								
							 
						 
						
							
							
								
								Merge pull request  #684  from mattr-/issue-680.  
							
							
							
						 
						
							2013-01-18 10:28:14 -05:00  
				
					
						
							
							
								 
						
							
								ce798a5956 
								
							 
						 
						
							
							
								
								Added test for all-String categories.  
							
							
							
						 
						
							2013-01-17 21:57:21 -05:00  
				
					
						
							
							
								 
						
							
								5e08cddb98 
								
							 
						 
						
							
							
								
								filter out test files in coverage results  
							
							
							
						 
						
							2013-01-16 22:27:23 -06:00  
				
					
						
							
							
								 
						
							
								00d74fa53f 
								
							 
						 
						
							
							
								
								Add SimpleCov to the unit tests  
							
							
							
						 
						
							2013-01-16 22:20:34 -06:00  
				
					
						
							
							
								 
						
							
								f460a6cf71 
								
							 
						 
						
							
							
								
								Merge branch 'master' into issue-653  
							
							
							
						 
						
							2013-01-16 21:52:32 -06:00  
				
					
						
							
							
								 
						
							
								e383bfe65d 
								
							 
						 
						
							
							
								
								Merge pull request  #743  from mccxj/master  
							
							... 
							
							
							
							add glob support to include, exclude option 
							
						 
						
							2013-01-12 22:16:07 -08:00  
				
					
						
							
							
								 
						
							
								5a3e05dbff 
								
							 
						 
						
							
							
								
								Ensuring that layout is only set to the default value if layout is not specified  
							
							
							
						 
						
							2013-01-12 15:31:14 -08:00  
				
					
						
							
							
								 
						
							
								e2affb2257 
								
							 
						 
						
							
							
								
								Added passing tests for  #616  
							
							
							
						 
						
							2013-01-12 00:14:00 -08:00  
				
					
						
							
							
								 
						
							
								a05b9159d9 
								
							 
						 
						
							
							
								
								Merge pull request  #616  from hokaccha/fix_pygments_opt  
							
							... 
							
							
							
							fixed pygments linenos options for pygments.rb 
							
						 
						
							2013-01-12 00:11:18 -08:00  
				
					
						
							
							
								 
						
							
								d2e750cc74 
								
							 
						 
						
							
							
								
								removed extraneous whitespace in test_site.rb  
							
							
							
						 
						
							2013-01-11 15:54:57 -08:00  
				
					
						
							
							
								 
						
							
								0fa55418e9 
								
							 
						 
						
							
							
								
								merge lastest from mojombo/jekyll master  
							
							
							
						 
						
							2013-01-11 12:23:53 +01:00  
				
					
						
							
							
								 
						
							
								9b8b5b2bda 
								
							 
						 
						
							
							
								
								Dont test kramdown  
							
							... 
							
							
							
							It should have it's own tests for that 
							
						 
						
							2013-01-11 11:02:07 +00:00  
				
					
						
							
							
								 
						
							
								660e5e0e14 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'jekyll/master'  
							
							
							
						 
						
							2013-01-11 15:45:54 +08:00  
				
					
						
							
							
								 
						
							
								3cf29eeee2 
								
							 
						 
						
							
							
								
								add Enumerable#glob_include?  
							
							
							
						 
						
							2013-01-11 15:33:11 +08:00  
				
					
						
							
							
								 
						
							
								92eb926bf8 
								
							 
						 
						
							
							
								
								Look for plugins under the source directory by default  
							
							
							
						 
						
							2013-01-10 21:24:28 -06:00  
				
					
						
							
							
								 
						
							
								a5c908ac3f 
								
							 
						 
						
							
							
								
								no good reason for making 'name' an instance variable  
							
							
							
						 
						
							2013-01-10 14:13:11 -08:00  
				
					
						
							
							
								 
						
							
								cf42c56630 
								
							 
						 
						
							
							
								
								stick to good coding standards  
							
							
							
						 
						
							2013-01-10 14:07:10 -08:00  
				
					
						
							
							
								 
						
							
								3e7f00ae19 
								
							 
						 
						
							
							
								
								test the path, not the parts  
							
							
							
						 
						
							2013-01-10 13:01:50 -08:00  
				
					
						
							
							
								 
						
							
								5d48c5390d 
								
							 
						 
						
							
							
								
								Add test/unit  
							
							
							
						 
						
							2013-01-10 20:47:55 +00:00  
				
					
						
							
							
								 
						
							
								ba48870ead 
								
							 
						 
						
							
							
								
								outputting full path when file does not parse  
							
							
							
						 
						
							2013-01-10 12:29:04 -08:00  
				
					
						
							
							
								 
						
							
								adba101734 
								
							 
						 
						
							
							
								
								update test for include,exclude glob support  
							
							
							
						 
						
							2013-01-09 16:44:53 +08:00  
				
					
						
							
							
								 
						
							
								655cf3b3a8 
								
							 
						 
						
							
							
								
								Update test/test_site.rb  
							
							
							
						 
						
							2013-01-09 16:23:58 +08:00  
				
					
						
							
							
								 
						
							
								6eed91871f 
								
							 
						 
						
							
							
								
								Changes based on @mojombo's feedback  
							
							
							
						 
						
							2013-01-08 23:17:06 +01:00  
				
					
						
							
							
								 
						
							
								da096f307b 
								
							 
						 
						
							
							
								
								Add testcases for YAML syntax error and non UTF-8 encoding  
							
							
							
						 
						
							2012-12-30 02:39:02 +02:00  
				
					
						
							
							
								 
						
							
								c23302f4fa 
								
							 
						 
						
							
							
								
								Merge branch 'deletion_protection' of  https://github.com/jasonroelofs/jekyll  into jasonroelofs-deletion_protection  
							
							
							
						 
						
							2012-12-26 14:02:41 -07:00  
				
					
						
							
							
								 
						
							
								3a8ebb4b71 
								
							 
						 
						
							
							
								
								Merge branch 'fix/front-matter-regexp' of  https://github.com/zimbatm/jekyll  into zimbatm-fix/front-matter-regexp  
							
							
							
						 
						
							2012-12-15 22:09:41 -08:00  
				
					
						
							
							
								 
						
							
								0b62b37122 
								
							 
						 
						
							
							
								
								Remove newline to fix failing Redcarpet test.  
							
							
							
						 
						
							2012-12-15 16:34:32 -08:00  
				
					
						
							
							
								 
						
							
								8fb4e8fcca 
								
							 
						 
						
							
							
								
								Convert slashes in titles to dashes when migrating from WordPress  
							
							... 
							
							
							
							When a post has a title that contains a slash, such as 'This is my cool
blog post part 1/2', convert the slash to a dash so that the post
filename is created correctly.
Fixes issue #680  
							
						 
						
							2012-12-04 20:45:20 -06:00  
				
					
						
							
							
								 
						
							
								7c800d3b07 
								
							 
						 
						
							
							
								
								Added a configuration variable: keep_files (default: ['.git']), based on this pull request:  https://github.com/mojombo/jekyll/pull/556  
							
							
							
						 
						
							2012-08-23 12:07:30 +02:00  
				
					
						
							
							
								 
						
							
								7f706f47fc 
								
							 
						 
						
							
							
								
								Update redcarpet support to version 2  
							
							
							
						 
						
							2012-08-13 15:03:33 +01:00  
				
					
						
							
							
								 
						
							
								3d2664d983 
								
							 
						 
						
							
							
								
								pygments options for pygments.rb  
							
							
							
						 
						
							2012-08-09 00:34:44 +09:00  
				
					
						
							
							
								 
						
							
								da4e8f2ee1 
								
							 
						 
						
							
							
								
								Front-matter should be at start of file  
							
							... 
							
							
							
							It's the theme of the moment ; regexp checking.
Just in case we have two line start with --- in the file, we want to
make sure it's not interpreted as a front-matter. 
							
						 
						
							2012-05-25 18:59:26 +01:00  
				
					
						
							
							
								 
						
							
								8a0fbf02f5 
								
							 
						 
						
							
							
								
								Cleanup for RDiscount TOC support.  Closes   #333 .  
							
							
							
						 
						
							2012-04-23 16:15:55 -07:00  
				
					
						
							
							
								 
						
							
								6471ebf0ef 
								
							 
						 
						
							
							
								
								Fixed helper inclusion in redcarpet test  
							
							
							
						 
						
							2012-04-23 15:57:06 -07:00  
				
					
						
							
							
								 
						
							
								fd5447a6e6 
								
							 
						 
						
							
							
								
								Added a test case for rdiscount toc rendering.  
							
							
							
						 
						
							2012-04-23 15:56:46 -07:00  
				
					
						
							
							
								 
						
							
								e29490c1c6 
								
							 
						 
						
							
							
								
								Allow setting of Kramdown smart_quotes.  Fixes   #482 .  
							
							
							
						 
						
							2012-04-23 15:34:54 -07:00  
				
					
						
							
							
								 
						
							
								4090500c5a 
								
							 
						 
						
							
							
								
								Added path in url.  
							
							... 
							
							
							
							Page#dir was returning the wrong dir ('/') for pages in directories. 
							
						 
						
							2012-04-09 03:08:41 +03:00  
				
					
						
							
							
								 
						
							
								604b60c9ba 
								
							 
						 
						
							
							
								
								Add checks to prevent accidental deletion of the source directory  
							
							
							
						 
						
							2012-04-03 22:05:18 -05:00  
				
					
						
							
							
								 
						
							
								8368485fa0 
								
							 
						 
						
							
							
								
								Remove deletion of dot files on cleanup.  
							
							... 
							
							
							
							This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.
All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files. 
							
						 
						
							2012-04-03 21:33:35 -05:00  
				
					
						
							
							
								 
						
							
								02366ae5ff 
								
							 
						 
						
							
							
								
								Merge branch 'PluginsAsArray' of  https://github.com/simensen/jekyll  into simensen-PluginsAsArray  
							
							
							
						 
						
							2012-01-29 12:32:59 -08:00  
				
					
						
							
							
								 
						
							
								e6d89c6a0f 
								
							 
						 
						
							
							
								
								More testing, whitespace and comment cleanup.  
							
							
							
						 
						
							2012-01-22 22:17:25 -08:00  
				
					
						
							
							
								 
						
							
								dcf546275b 
								
							 
						 
						
							
							
								
								Tweaked plugin directory handling, tests.  
							
							
							
						 
						
							2012-01-22 22:10:12 -08:00  
				
					
						
							
							
								 
						
							
								16a4855200 
								
							 
						 
						
							
							
								
								Merge branch 'post_url' of  https://github.com/thatguystone/jekyll  into thatguystone-post_url  
							
							
							
						 
						
							2012-01-22 16:03:10 -08:00  
				
					
						
							
							
								 
						
							
								65890da3d1 
								
							 
						 
						
							
							
								
								Merge branch 'categories_with_space' of  https://github.com/spk/jekyll  into spk-categories_with_space  
							
							
							
						 
						
							2012-01-21 19:36:09 -08:00  
				
					
						
							
							
								 
						
							
								d0d143452a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/laumann/jekyll  
							
							
							
						 
						
							2012-01-15 20:39:55 -08:00  
				
					
						
							
							
								 
						
							
								c14eb346a3 
								
							 
						 
						
							
							
								
								Allow [+.#-] in highlight lang shortnames.  Fixes   #282 .  
							
							
							
						 
						
							2012-01-15 20:35:09 -08:00