]> git.pld-linux.org Git - packages/ruby-ohai.git/commit
Merge branch 'dev-7.0.0' into ohai-6
authorElan Ruusamäe <glen@delfi.ee>
Fri, 21 Nov 2014 13:15:45 +0000 (15:15 +0200)
committerElan Ruusamäe <glen@delfi.ee>
Fri, 21 Nov 2014 13:18:01 +0000 (15:18 +0200)
commite3e3d619960be5e7a4a7996f0c5c5e961b69ab75
treec219920a899c3692f338dfc6ece83c52438399bf
parentc5abc6023aaab7fa567794db13ed272f3eee0eb3
parent6f3109046b85015816a019de3388dc806c077252
Merge branch 'dev-7.0.0' into ohai-6

Conflicts:
ruby-ohai.spec
ruby-ohai.spec
This page took 0.071996 seconds and 4 git commands to generate.