Merge branch '1.0' into 1.1

* 1.0: Updated year in License

Merge branch '1.0' into 1.1
* 1.0: Updated year in License
93dde279 · Fabien Potencier · 5633f1b6 · 6e4b26d7 · 93dde279
Commit 93dde279 authored Jan 08, 2014 by Fabien Potencier
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

LICENSE LICENSE +1 -1

No files found.
--- a/LICENSE
+++ b/LICENSE
-Copyright (c) 2010-2013 Fabien Potencier
+Copyright (c) 2010-2014 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal