[yast-commit] [yast/yast-proxy] c1e05e: Merge branch 'SLE-12-GA'

Branch: refs/heads/curlrc-proxy-fix2 Home: https://github.com/yast/yast-proxy Commit: c1e05e225bca71ab71a6321b28aa468bd00876a8 https://github.com/yast/yast-proxy/commit/c1e05e225bca71ab71a6321b28aa468bd0... Author: Martin Vidner Date: 2015-06-12 (Fri, 12 Jun 2015) Changed paths: A .coveralls.yml M .gitignore M .travis.yml M README.md M package/yast2-proxy.changes M package/yast2-proxy.spec M src/include/proxy/dialogs.rb M src/modules/Proxy.rb M test/test_helper.rb M test/write_test.rb Log Message: ----------- Merge branch 'SLE-12-GA' Conflicts: .travis.yml README.md package/yast2-proxy.spec test/test_helper.rb