Point with label is displayed imcompletely

Only text is displayed, point is not visible.
Update PointRenderer.java

Check externalGraphic void string.
Potential fix for image output.  It was previously hardcoded as png.
Merge branch 'master' of https://github.com/mapfish/mapfish-print
Indentation detail
Merge pull request #99 from severo/master

Indentation detail
Merge pull request #84 from geops/master

Check externalGraphic void string.
Merge branch 'fix-label' of git://github.com/haiiro-shimeji/mapfish-print

Conflicts:
	src/main/java/org/mapfish/print/map/renderers/vector/PointRenderer.java
added imagemajick parameters for a white border.
Correct imagemagick parameter order.

I had the imagemagick parameters in the wrong order.
Update conf documentation (resolution and legends block)
Merge pull request #101 from severo/master

Update conf documentation (resolution and legends block)
Be able to override the params
Replace tab with space
Remove end white space