Merge branch 'release/0.2.15' into develop

* release/0.2.15:
  bump copyright years
  bump version number
This commit is contained in:
Jan Dittberner 2013-01-20 10:48:16 +01:00
commit caad24b919
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
# #
# Configuration for DDPortfolio service # Configuration for DDPortfolio service
# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info> # Copyright © 2009, 2010, 2011, 2012, 2013 Jan Dittberner <jan@dittberner.info>
# #
# This file is part of DDPortfolio service. # This file is part of DDPortfolio service.
# #

View file

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# DDPortfolio service setup # DDPortfolio service setup
# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info> # Copyright © 2009, 2010, 2011, 2012, 2013 Jan Dittberner <jan@dittberner.info>
# #
# This file is part of DDPortfolio service. # This file is part of DDPortfolio service.
# #
@ -29,7 +29,7 @@ except ImportError:
setup( setup(
name='ddportfolioservice', name='ddportfolioservice',
version='0.2.14', version='0.2.15',
description='service to create DDPortfolio URLs', description='service to create DDPortfolio URLs',
long_description="""This is a service implementation that long_description="""This is a service implementation that
returns a set of personalized URLs as outlined in returns a set of personalized URLs as outlined in