[yast-commit] [yast/yast-network] 1ebd59: Merge branch 'SLE-12-GA' into wifi-abort-error-sp1

Branch: refs/heads/wifi-abort-error-sp1 Home: https://github.com/yast/yast-network Commit: 1ebd59f4dd93b99721b947d16cc314e3bca4d692 https://github.com/yast/yast-network/commit/1ebd59f4dd93b99721b947d16cc314e3... Author: Martin Vidner Date: 2016-01-22 (Fri, 22 Jan 2016) Changed paths: M package/yast2-network.changes M package/yast2-network.spec M src/include/network/lan/wireless.rb Log Message: ----------- Merge branch 'SLE-12-GA' into wifi-abort-error-sp1 Conflicts: package/yast2-network.spec