Merge remote-tracking branch 'origin/scripts' into stable
authorJiri Slaby <jslaby@suse.cz>
Thu, 28 Mar 2013 23:15:30 +0000 (00:15 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 28 Mar 2013 23:15:30 +0000 (00:15 +0100)
commit217832289b3d984471ea0b97b3cb21b3502c8500
tree21cbcc18d3bdca208f8a23e99df7044fae72e497
parentacb103a51437bbce12cf01e1266fbd5d59a53183
parent83a948a731f518dff988c7a15eb8614bf3eeee1b
Merge remote-tracking branch 'origin/scripts' into stable