Merge remote-tracking branch 'origin/SLE-12-GA'

Conflicts:
	.travis.yml
	Rakefile

.travis.yml

@@ -5,8 +5,10 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "yast2-devtools yast2-testsuite yast2 yast2-perl-bindings" -g rspec:2.14.1
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-perl-bindings" -g "rspec:2.14.1 yast-rake gettext"
 script:
+    - rake check:syntax
+    - rake check:pot
     - make -f Makefile.cvs
     - make
     - sudo make install

Rakefile

@@ -1,6 +1,13 @@
 require "yast/rake"
 
 Yast::Tasks.configuration do |conf|
+<<<<<<< HEAD
+=======
+  conf.obs_api = "https://api.suse.de/"
+  conf.obs_target = "SLE_12"
+  conf.obs_sr_project = "SUSE:SLE-12:Update"
+  conf.obs_project = "Devel:YaST:SLE-12"
+>>>>>>> origin/SLE-12-GA
   #lets ignore license check for now
   conf.skip_license_check << /.*/
 end