Merge remote-tracking branch 'origin/master' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 31 Mar 2014 15:17:04 +0000 (17:17 +0200)
committerJiri Slaby <jslaby@suse.cz>
Mon, 31 Mar 2014 15:17:04 +0000 (17:17 +0200)
commit71ac4e3ed08c4efe76e8e17ddfa5acbae2bfbe4e
tree7c055e45f6d9f99bc21cb360bb0bb73854aaec05
parent7e9885b72000cc362e10473108951e16206c7ba5
parentf9287c7a74fee34c1a9cb08d6b0734176cfd3bf3
Merge remote-tracking branch 'origin/master' into stable

Conflicts:
config/*
series.conf

suse-commit: 79de0a752e2781cc63a678c3228d4e1664f5ec77