Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-01-08 16:34:38 +01:00
commit b4ff6d9727
1 changed files with 2 additions and 2 deletions

View File

@ -112,7 +112,7 @@ means to use the maximum value consistent with other options."
* @licstart The following is the entire license notice for the * @licstart The following is the entire license notice for the
* JavaScript code in %SCRIPT_PATH. * JavaScript code in %SCRIPT_PATH.
* *
* Copyright (C) 2012 Sebastian Rose * Copyright (C) 2012-2013 Sebastian Rose
* *
* *
* The JavaScript code in this tag is free software: you can * The JavaScript code in this tag is free software: you can
@ -141,7 +141,7 @@ means to use the maximum value consistent with other options."
@licstart The following is the entire license notice for the @licstart The following is the entire license notice for the
JavaScript code in this tag. JavaScript code in this tag.
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012-2013 Free Software Foundation, Inc.
The JavaScript code in this tag is free software: you can The JavaScript code in this tag is free software: you can
redistribute it and/or modify it under the terms of the GNU redistribute it and/or modify it under the terms of the GNU