[mapserver-commits] [mapserver/mapserver] 7035e3: Merge branch 'branch-5-6' into branch-6-0

[GitHub]

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

  Log Message:
  -----------
  Merge branch 'branch-5-6' into branch-6-0


  Commit: 1991f221e60f51ae598fbe33f1fd6d8dacc6794d
      https://github.com/mapserver/mapserver/commit/1991f221e60f51ae598fbe33f1fd6d8dacc6794d
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Log Message:
  -----------
  Merge branch 'branch-6-0'


  Commit: 08c9e63c3abcc20c2f4c9572fa2596a2b30e600a
      https://github.com/mapserver/mapserver/commit/08c9e63c3abcc20c2f4c9572fa2596a2b30e600a
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A .gitignore

  Log Message:
  -----------
  Merge branch 'branch-5-6' into branch-6-0


  Commit: 2178cd33c8302bf20c92a35abe7f4dd546f7a42d
      https://github.com/mapserver/mapserver/commit/2178cd33c8302bf20c92a35abe7f4dd546f7a42d
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A .gitignore

  Log Message:
  -----------
  Merge branch 'branch-6-0'


  Commit: 7ba9639891ee57ecdc6889b0c81316ede04c8f93
      https://github.com/mapserver/mapserver/commit/7ba9639891ee57ecdc6889b0c81316ede04c8f93
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-5-6' into branch-6-0


  Commit: c5e21cd1c73989d159da38c555272825757a35c9
      https://github.com/mapserver/mapserver/commit/c5e21cd1c73989d159da38c555272825757a35c9
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-6-0'


  Commit: 1587b46804d8e165b30a1ba70d66a37a5b8feb0d
      https://github.com/mapserver/mapserver/commit/1587b46804d8e165b30a1ba70d66a37a5b8feb0d
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch 'branch-5-6' into branch-6-0


  Commit: c7d78fc1a7526c6bf34cd4c30810b825e4de7725
      https://github.com/mapserver/mapserver/commit/c7d78fc1a7526c6bf34cd4c30810b825e4de7725
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch 'branch-6-0'


  Commit: f5eff428443206d813576f9c98c8d8af332939c3
      https://github.com/mapserver/mapserver/commit/f5eff428443206d813576f9c98c8d8af332939c3
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-5-6' into branch-6-0


  Commit: 5cc96f8bde2d17446086a9ea6e0a8bfb32e2f335
      https://github.com/mapserver/mapserver/commit/5cc96f8bde2d17446086a9ea6e0a8bfb32e2f335
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-6-0'


  Commit: 9b1c60893975b19f7645f930c43ed8e22946c096
      https://github.com/mapserver/mapserver/commit/9b1c60893975b19f7645f930c43ed8e22946c096
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-5-6' into branch-6-0


  Commit: 64e0bf6fe3152f41124cf045e17af7b4a772e739
      https://github.com/mapserver/mapserver/commit/64e0bf6fe3152f41124cf045e17af7b4a772e739
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-6-0'


  Commit: 6e5cb8bfa3a4d78ac8640f8eaf0a12413b29787d
      https://github.com/mapserver/mapserver/commit/6e5cb8bfa3a4d78ac8640f8eaf0a12413b29787d
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M mapcache/README

  Log Message:
  -----------
  reflect move to github


Compare: https://github.com/mapserver/mapserver/compare/7035e3f^...6e5cb8b