Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant-antlibs-dotnet
authorStefan Bodewig <bodewig@apache.org>
Sat, 26 Jul 2014 05:49:47 +0000 (07:49 +0200)
committerStefan Bodewig <bodewig@apache.org>
Sat, 26 Jul 2014 05:49:47 +0000 (07:49 +0200)
commitbc4fcf5c5fe6ec2bae989b8f677fa5f77e5fdcc6
treea276eb8cec0c0294ef43fb37f746d66f3e55444e
parentafd9d85c28b4d72f64ae4e45c73317ca91b603b5
parentb43d478799bb2c8771ad28030c8f26cb66fdda23
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant-antlibs-dotnet

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.