]> git.proxmox.com Git - libgit2.git/commitdiff
Merge branch 'development'
authorVicent Marti <tanoku@gmail.com>
Fri, 18 May 2012 23:46:11 +0000 (01:46 +0200)
committerVicent Marti <tanoku@gmail.com>
Fri, 18 May 2012 23:46:11 +0000 (01:46 +0200)
Conflicts:
.travis.yml


Trivial merge