merge r26988
authorJo-Philipp Wich <[email protected]>
Tue, 24 May 2011 09:30:55 +0000 (09:30 +0000)
committerJo-Philipp Wich <[email protected]>
Tue, 24 May 2011 09:30:55 +0000 (09:30 +0000)
commit0a9c8bfa8ea1e09e6501fbf957ac16336c51025f
tree67eb565cf49a1a68e2800254a4e5425fa5a40662
parent92baf6bc55e7e944b94230bcb527a51b441e2a71
merge r26988

SVN-Revision: 26989
scripts/feeds