Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Wed, 8 May 2013 15:02:04 +0000 (17:02 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 8 May 2013 15:02:04 +0000 (17:02 +0200)
commitb6484b6fb03f74e16df9c442538197be9232624e
treee38de2db6e379d7220f7a0204e8350f4bb49b36c
parent457cceb283a22859668e96fc28eda948e0ee0d8c
parentb7b6d40c2573f2698dcd29a5b9b624d72b97de57
Merge branch 'master' into stable

Conflicts:
rpm/config.sh