Merge branch 'stable' into pud
authorFerry Huberts <f.huberts@mindef.nl>
Thu, 3 Nov 2011 11:12:02 +0000 (12:12 +0100)
committerFerry Huberts <f.huberts@mindef.nl>
Thu, 3 Nov 2011 11:12:02 +0000 (12:12 +0100)
commit808e2f58beb204afcfa9d638400d12ed5d7f6af5
tree4d3a6bc7fe541099cafd5c9d8e61161a89b9febf
parentda1fcac25dc28bc52f891cc45832206c6f5c7884
parent666fc8e8bf35d54c1276069b043694cab6daccd2
Merge branch 'stable' into pud

* stable:
  Fix metric parsing for Quagga 0.99.x (thanks Jon Andersson)