Merge git://git.icculus.org/duncan/yast2-ruby-bindings
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Mon, 26 Nov 2007 17:42:50 +0000 (18:42 +0100)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Mon, 26 Nov 2007 17:42:50 +0000 (18:42 +0100)
commitfd6d9ec4d7c8a0826a806f5ffa0bdbb840678de7
tree4cd48488a5c62f88045bd2252e2537efe5226601
parent2e38c166a95ee60dec5b4b4dff939b2bc4aec871
parenta3911eda0aea360e85e684639dabc83761285de9
Merge git://git.icculus.org/duncan/yast2-ruby-bindings

Conflicts:

src/ruby/YCP.cc
src/ruby/YCP.cc