Merge branch 'softwaretype_raise'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 21 Nov 2012 09:17:12 +0000 (09:17 +0000)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 21 Nov 2012 09:17:12 +0000 (09:17 +0000)
commit33c54add63159c998388bce8f4e8e020c91f0cf5
treea8be642aa89a34bb2a7ec2e66eab6f709e0eecb0
parent721b8459604ce6d3199b1f4135756e6aaa6c18fe
parent9b09012e7b7680389182d57ecdb9d7fbbacd6513
Merge branch 'softwaretype_raise'