Merge branch 'master' into devel

This commit is contained in:
Gina Häußge 2014-11-10 09:21:23 +01:00
commit dcdbd3652a
3 changed files with 3 additions and 3 deletions

View file

@ -1,5 +1,5 @@
from __future__ import absolute_import
# coding=utf-8
from __future__ import absolute_import
__author__ = "Gina Häußge <osd@foosel.net> based on work by David Braam"
__license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"

View file

@ -1,5 +1,5 @@
from __future__ import absolute_import
# coding=utf-8
from __future__ import absolute_import
__author__ = "Gina Häußge <osd@foosel.net> based on work by David Braam"
__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
__copyright__ = "Copyright (C) 2013 David Braam, Gina Häußge - Released under terms of the AGPLv3 License"

View file

@ -1,5 +1,5 @@
from __future__ import absolute_import
# coding=utf-8
from __future__ import absolute_import
__author__ = "Gina Häußge <osd@foosel.net>"
__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'