diff options
author | David Bremner <bremner@debian.org> | 2012-03-19 22:48:24 -0300 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-03-19 22:48:24 -0300 |
commit | 2ee1d8e1c70ce20728bc3faada389a4802636352 (patch) | |
tree | 50eac08433a84be5832cf89eb610dc803b758c3f /configure | |
parent | eb82b4551ad0c5e808a677d886f58ba2c41f970d (diff) | |
parent | 82fd8c1a83518c49fa7c7b87c6595156106e1f79 (diff) |
Merge branch 'release'
Conflicts:
NEWS
Conflicts resolved by hand for date of 0.12 release.
Diffstat (limited to 'configure')
0 files changed, 0 insertions, 0 deletions