Branch: refs/heads/clipped-arabic-m Home: https://github.com/yast/yast-yast2 Commit: 9561057089f12da58d8f0955ad5050f766d5ff94 https://github.com/yast/yast-yast2/commit/9561057089f12da58d8f0955ad5050f766... Author: Martin Vidner Date: 2015-10-19 (Mon, 19 Oct 2015) Changed paths: M package/yast2.changes M package/yast2.spec M scripts/yast2 Log Message: ----------- Merge branch 'SLE-12-GA' into clipped-arabic-m Conflicts: library/general/src/modules/Arch.rb package/yast2.spec scripts/yast2