Branch: refs/heads/jsmeix_patches_master Home: https://github.com/yast/yast-scanner Commit: b03f9ef07e976a7c47383c5b79d183321fb61a1f https://github.com/yast/yast-scanner/commit/b03f9ef07e976a7c47383c5b79d18332... Author: Josef Reidinger Date: 2015-01-19 (Mon, 19 Jan 2015) Changed paths: M Rakefile M package/yast2-scanner.changes M src/modules/Scanner.rb M tools/setup_network_scanner_config Log Message: ----------- Merge remote-tracking branch 'origin/openSUSE-13_2' into jsmeix_patches_master Conflicts: package/yast2-scanner.changes