Merge branch 'release/0.2.15' into develop
authorJan Dittberner <jan@dittberner.info>
Sun, 20 Jan 2013 09:48:16 +0000 (10:48 +0100)
committerJan Dittberner <jan@dittberner.info>
Sun, 20 Jan 2013 09:48:16 +0000 (10:48 +0100)
commitcaad24b9196cbe2c020c2aee3a5a60b117bd86a8
tree3385b15ff5d24836cee7362d91ab1dfaf6a86a0c
parentf1716a3dbf6c6e0ad37b0e7ba48dfc003cfe18b6
parent8ff89db55729d960da68bdcf2f4a2841cabf5048
Merge branch 'release/0.2.15' into develop

* release/0.2.15:
  bump copyright years
  bump version number