Merge branch 'master' of git.sv.gnu.org:/srv/git/dejagnu
authorBen Elliston <bje@gnu.org>
Tue, 15 Jul 2014 12:56:46 +0000 (22:56 +1000)
committerBen Elliston <bje@gnu.org>
Tue, 15 Jul 2014 12:56:46 +0000 (22:56 +1000)
commitee21af3cae2cc92bc10b7e19f04b31f785ce04bd
treeb9ec0f527bf46018f1b5f85b018800d02e28d7c1
parentf53d3dc51d10229a40df1fc85dd330a0fbc12727
parent45a1dbdf9a382b63d51fd28248be206c33f7afc0
Merge branch 'master' of git.sv.gnu.org:/srv/git/dejagnu

Conflicts:
ChangeLog
ChangeLog