Merge branch 'openSUSE-13.1' into stable
authorJiri Slaby <jslaby@suse.cz>
Sat, 19 Oct 2013 13:21:13 +0000 (15:21 +0200)
committerJiri Slaby <jslaby@suse.cz>
Sat, 19 Oct 2013 13:21:13 +0000 (15:21 +0200)
commitf7498bf4c478bfdf2e33c8abaf93575d88038933
tree01e8b5e91c020356ea797b0c8a8ee743999cf8ca
parenta012288085d7ce8371a4ba6459f18b326a283498
parent9ca682723fc05ad45374698171bb7b55ecb0d04c
Merge branch 'openSUSE-13.1' into stable