[clasp] 01/02: Merge branch 'devel'

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch master
in repository clasp.

commit f0baa5bde99baf8bdc13b4e5b35e45d863a207f1
Merge: 58cbf50 a2f40fd
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Tue May 12 07:17:57 2015 +0200

    Merge branch 'devel'

 debian/copyright | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clasp.git