[releng: 4/4] Merge #3 `atomic-osname`

[Dennis Gilmore]

commit 3b0d8a9a38d1ba30125cc61596de365c13e48033
Merge: 870c3c1 c5f97b5
Author: Colin Walters <walters at verbum.org>
Date:   Sat Apr 25 11:06:34 2015 -0400

    Merge #3 `atomic-osname`

 scripts/run-pungi |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---