Merge pull request #6 from akozumpl/upstream
authorMichael Schroeder <mls@suse.de>
Wed, 15 Feb 2012 12:04:47 +0000 (04:04 -0800)
committerMichael Schroeder <mls@suse.de>
Wed, 15 Feb 2012 12:04:47 +0000 (04:04 -0800)
commitf88a3592ebb5b4af77f791e37f097796a30a6472
tree715bda04dd082d0c4461596d6171223ca1abee10
parent9949c0580e233de572471a4fa1d44cdfe2785870
parenta18f35dc8d3d412f289555043772737adc9c7c29
Merge pull request #6 from akozumpl/upstream

Upstream