tree 7baca5112bf1c051fd3d01a224e2681b89f722b4
parent d4ebabf889f7b016ffcb5f74c350e1e5424b2094
parent 2e6f5f3f0c40ab9cb459742296f6a2aaab1fd5dc
author Eric Paris <eparis@redhat.com> 1430332663 -0400
committer Eric Paris <eparis@redhat.com> 1430332663 -0400

Merge remote-tracking branch 'ogier/master' into merge

Conflicts:
	bool_test.go
	flag.go
	flag_test.go