summaryrefslogtreecommitdiff
path: root/build-aux
Commit message (Expand)AuthorAge
* Merge branch 'upstream'Manoj Srivastava2016-01-22
* Imported Upstream version 2.6.0Manoj Srivastava2016-01-22