Merge branch 'stable' into pud
authorFerry Huberts <f.huberts@mindef.nl>
Mon, 10 Oct 2011 13:20:21 +0000 (15:20 +0200)
committerFerry Huberts <f.huberts@mindef.nl>
Mon, 10 Oct 2011 13:20:21 +0000 (15:20 +0200)
commit42f881a74ab8ca20bced426c507a5c9d908ff8cd
tree3cdfeb4a11d3ca0cc7bb8a72f0dd520344eb2290
parent557b3e03a8276fa661d466cf5e05b67628ebe163
parenta66a3738f20a79cd793d26b640a0d20925f1d32f
Merge branch 'stable' into pud

* stable:
  bmf: fix warnings
  parser: fix warnings