[mapserver-commits] [mapserver/mapserver] e4fa61: Merge branch 'master' of github.com:mapserver/maps...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: e4fa616848121a118e2bee1e880fcc3f6043cb87
      https://github.com/mapserver/mapserver/commit/e4fa616848121a118e2bee1e880fcc3f6043cb87
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M HISTORY.TXT
  M README
  M mapcache/INSTALL
  M mapcache/README
  M mapcopy.c

  Log Message:
  -----------
  Merge branch 'master' of github.com:mapserver/mapserver

Conflicts:
	mapcache/README