Merge remote-tracking branch 'origin/master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 15:59:43 +0000 (17:59 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 15:59:43 +0000 (17:59 +0200)
commit990059fabbb5a33a82738e370eca3414abc79159
tree6c2f3d9d64b36b1f6774dbdc7be4d93cdba0b6dd
parent76e317e0d16d62a44d846a5564ca5a788b202e26
parenteb7005395f4889e54ef136ea473c67806214558c
Merge remote-tracking branch 'origin/master' into stable