Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1ZwqLI-0001Ay-Kf for pgadmin-hackers@arkaria.postgresql.org; Thu, 12 Nov 2015 11:47:04 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1ZwqLI-0001Gk-6Y for pgadmin-hackers@arkaria.postgresql.org; Thu, 12 Nov 2015 11:47:04 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1ZwqL4-0000pi-FS for pgadmin-hackers@postgresql.org; Thu, 12 Nov 2015 11:46:50 +0000 Received: from mahout.postgresql.org ([2001:4800:1501:1::227]) by makus.postgresql.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.84) (envelope-from ) id 1ZwqL1-0007tk-Jf for pgadmin-hackers@postgresql.org; Thu, 12 Nov 2015 11:46:49 +0000 Received: from gothos.postgresql.org ([204.145.124.243]) by mahout.postgresql.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1ZwqL0-00049z-UU for pgadmin-hackers@postgresql.org; Thu, 12 Nov 2015 11:46:47 +0000 Received: from git by gothos.postgresql.org with local (Exim 4.80) (envelope-from ) id 1ZwqKz-0005CO-GJ for pgadmin-hackers@postgresql.org; Thu, 12 Nov 2015 11:46:45 +0000 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Dave Page To: pgadmin-hackers@postgresql.org Subject: pgAdmin III commit: Automatic merge using stringmerge script. Message-Id: Date: Thu, 12 Nov 2015 11:46:45 +0000 X-Pg-Spam-Score: -7.3 (-------) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org QXV0b21hdGljIG1lcmdlIHVzaW5nIHN0cmluZ21lcmdlIHNjcmlwdC4KCkJy YW5jaAotLS0tLS0KbWFzdGVyCgpEZXRhaWxzCi0tLS0tLS0KaHR0cDovL2dp dC5wb3N0Z3Jlc3FsLm9yZy9naXR3ZWI/cD1wZ2FkbWluMy5naXQ7YT1jb21t aXRkaWZmO2g9NTI0OWNkYjRkMDNmYzBiODQ3YzYwNjA1MjVlNTBjZmRhZWUw NDE4MQoKTW9kaWZpZWQgRmlsZXMKLS0tLS0tLS0tLS0tLS0KaTE4bi9hZl9a QS9wZ2FkbWluMy5wbyB8IDI3ODAgKy0tCmkxOG4vYXJfU0EvcGdhZG1pbjMu cG8gfCAyNzYyICstLQppMThuL2JnX0JHL3BnYWRtaW4zLnBvIHwgMjc2NyAr LS0KaTE4bi9jYV9FUy9wZ2FkbWluMy5wbyB8IDI3NzUgKy0tCmkxOG4vY3Nf Q1ovcGdhZG1pbjMucG8gfDQ5MzkwICsrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQppMThuL2RhX0RLL3BnYWRtaW4z LnBvIHwgMjgyMiArLS0KaTE4bi9kZV9DSC9wZ2FkbWluMy5wbyB8IDI3NjAg Ky0tCmkxOG4vZGVfREUvcGdhZG1pbjMucG8gfCAyNzc3ICstLQppMThuL2Vs X0dSL3BnYWRtaW4zLnBvIHwgMjc2MiArLS0KaTE4bi9lc19FUy9wZ2FkbWlu My5wbyB8IDI3NzIgKy0tCmkxOG4vZmFfSVIvcGdhZG1pbjMucG8gfCAyNzY1 ICstLQppMThuL2ZpX0ZJL3BnYWRtaW4zLnBvIHwgMjc2MyArLS0KaTE4bi9m cl9GUi9wZ2FkbWluMy5wbyB8IDI3ODMgKy0tCmkxOG4vZ2xfRVMvcGdhZG1p bjMucG8gfCAyNzYwICstLQppMThuL2d1X0lOL3BnYWRtaW4zLnBvIHwgMjc0 OCArLS0KaTE4bi9oaV9JTi9wZ2FkbWluMy5wbyB8IDI3NTEgKy0tCmkxOG4v aHJfSFIvcGdhZG1pbjMucG8gfCAyODMwICstLQppMThuL2h1X0hVL3BnYWRt aW4zLnBvIHwgMjc2MyArLS0KaTE4bi9pZF9JRC9wZ2FkbWluMy5wbyB8IDI3 OTAgKy0tCmkxOG4vaXNfSVMvcGdhZG1pbjMucG8gfCAyNzQ4ICstLQppMThu L2l0X0lUL3BnYWRtaW4zLnBvIHwgMjgxMiArLS0KaTE4bi9qYV9KUC9wZ2Fk bWluMy5wbyB8IDI4MTIgKy0tCmkxOG4va29fS1IvcGdhZG1pbjMucG8gfCAy ODA4ICstLQppMThuL2x0X0xUL3BnYWRtaW4zLnBvIHwgMjc2MCArLS0KaTE4 bi9sdl9MVi9wZ2FkbWluMy5wbyB8IDI3NzMgKy0tCmkxOG4vbWtfTUsvcGdh ZG1pbjMucG8gfCAyNzQ4ICstLQppMThuL25iX05PL3BnYWRtaW4zLnBvIHwg Mjc4OCArLS0KaTE4bi9ubF9OTC9wZ2FkbWluMy5wbyB8IDI3NjUgKy0tCmkx OG4vcGxfUEwvcGdhZG1pbjMucG8gfCAyNzc2ICstLQppMThuL3B0X0JSL3Bn YWRtaW4zLnBvIHwgMjc4NyArLS0KaTE4bi9wdF9QVC9wZ2FkbWluMy5wbyB8 IDI3OTAgKy0tCmkxOG4vcm9fUk8vcGdhZG1pbjMucG8gfCAyNzk0ICstLQpp MThuL3J1X1JVL3BnYWRtaW4zLnBvIHwgMjc5OSArLS0KaTE4bi9za19TSy9w Z2FkbWluMy5wbyB8IDI3NjAgKy0tCmkxOG4vc2xfU0kvcGdhZG1pbjMucG8g fCAyNzYwICstLQppMThuL3NyX1JTL3BnYWRtaW4zLnBvIHwgMjc2OSArLS0K aTE4bi9zdl9TRS9wZ2FkbWluMy5wbyB8IDI3NjAgKy0tCmkxOG4vdGVfSU4v cGdhZG1pbjMucG8gfCAyNzQ4ICstLQppMThuL3RsX1BIL3BnYWRtaW4zLnBv IHwgMjc4MiArLS0KaTE4bi90cl9UUi9wZ2FkbWluMy5wbyB8IDI4MjggKy0t CmkxOG4vdWtfVUEvcGdhZG1pbjMucG8gfCAyNzQ4ICstLQppMThuL3VyX1BL L3BnYWRtaW4zLnBvIHwgMjc1NyArLS0KaTE4bi92aV9WTi9wZ2FkbWluMy5w byB8IDI3NDggKy0tCmkxOG4vemhfQ04vcGdhZG1pbjMucG8gfCAyNzc2ICst LQppMThuL3poX1RXL3BnYWRtaW4zLnBvIHwgMjc2NyArLS0KNDUgZmlsZXMg Y2hhbmdlZCwgODkxMzIgaW5zZXJ0aW9ucygrKSwgODIzNTEgZGVsZXRpb25z KC0pCgoKLS0gClNlbnQgdmlhIHBnYWRtaW4taGFja2VycyBtYWlsaW5nIGxp c3QgKHBnYWRtaW4taGFja2Vyc0Bwb3N0Z3Jlc3FsLm9yZykKVG8gbWFrZSBj aGFuZ2VzIHRvIHlvdXIgc3Vic2NyaXB0aW9uOgpodHRwOi8vd3d3LnBvc3Rn cmVzcWwub3JnL21haWxwcmVmL3BnYWRtaW4taGFja2Vycwo=