Merge branch '2.1' of github.com:imathis/octopress into 2.1

* '2.1' of github.com:imathis/octopress:
  It's 2013. Hi, MIT License.
This commit is contained in:
Parker Moore 2013-02-28 21:32:21 +01:00
commit 7158058311

View File

@ -24,7 +24,7 @@ We love to see people contributing to Octopress, whether it's a bug report, feat
## License
(The MIT License)
Copyright © 2009-2011 Brandon Mathis
Copyright © 2009-2013 Brandon Mathis
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: