Merge branch '1.0' of git.carlh.net:git/libsub into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 25 Sep 2015 12:56:35 +0000 (13:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 25 Sep 2015 12:56:35 +0000 (13:56 +0100)
commit22c2edc0f0e798fe12fe7b89cfd56fe7baab45e8
tree5f7fa58037e92efc7ee6f69f41402ff647005dc8
parent35249aba26fccb83ad8dc703a3ea02d211ea840f
parent992b91d65f175e0e74387b33153ac5fb830d70e1
Merge branch '1.0' of git.carlh.net:git/libsub into 1.0