Merge remote-tracking branch 'upstream/master'
authorAndreas Gerstmayr <andreas@andreasgerstmayr.at>
Sun, 18 Mar 2012 16:12:48 +0000 (17:12 +0100)
committerAndreas Gerstmayr <andreas@andreasgerstmayr.at>
Sun, 18 Mar 2012 16:12:48 +0000 (17:12 +0100)
commita63d0380a478344672fd1c05c2aafe19e75a8c54
treeedc33da2c15b93f61d0440bb8c91e171058a0c35
parentc9bcd68953fdf060ab0e0e1ad82c850157f89540
parentd97e19ff90fd966ae322036060caaeb453dfac00
Merge remote-tracking branch 'upstream/master'