[QGIS Commit] [qgis/Quantum-GIS] ac93c0: apply #4685

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS

  Commit: ac93c0c30f88d3987ea55313671709871aa35c65
      https://github.com/qgis/Quantum-GIS/commit/ac93c0c30f88d3987ea55313671709871aa35c65
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M src/providers/postgres/qgspostgresprovider.cpp

  Log Message:
  -----------
  apply #4685


  Commit: d4ddf368baa7e7b362f2835394c018af1d5cf745
      https://github.com/qgis/Quantum-GIS/commit/d4ddf368baa7e7b362f2835394c018af1d5cf745
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M resources/srs.db

  Log Message:
  -----------
  readd google mercartor (pseudo epsg:900913) removed with with 42e02d82c05b4da370be77ef71345ba62457cc66 (IssueID #4652)


Compare: https://github.com/qgis/Quantum-GIS/compare/bd1300a...d4ddf36