Branch: refs/heads/port_fix_vga Home: https://github.com/yast/yast-bootloader Commit: 68d63a77009803ec3eac0bed956b0ab88d35466e https://github.com/yast/yast-bootloader/commit/68d63a77009803ec3eac0bed956b0... Author: Josef Reidinger Date: 2014-09-17 (Wed, 17 Sep 2014) Changed paths: M package/yast2-bootloader.changes M src/modules/BootGRUB2.rb Log Message: ----------- Merge remote-tracking branch 'origin/SLE-12-GA' into port_fix_vga Conflicts: package/yast2-bootloader.spec