Merge branch 'release-v0.11.2' into release

Author: sfackler

.travis.yml

@@ -10,4 +10,4 @@ before_script:
 - "./.travis/setup.sh"
 script:
 - cargo test
-- cargo test --features "uuid rustc-serialize time unix_socket serde_json chrono openssl bit-vec"
+- cargo test --features "uuid rustc-serialize time unix_socket serde_json chrono openssl bit-vec eui48"

Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "postgres"
-version = "0.11.1"
+version = "0.11.2"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "A native PostgreSQL driver"
 repository = "https://github.com/sfackler/rust-postgres"
-documentation = "https://sfackler.github.io/rust-postgres/doc/v0.11.1/postgres"
+documentation = "https://sfackler.github.io/rust-postgres/doc/v0.11.2/postgres"
 readme = "README.md"
 keywords = ["database", "postgres", "postgresql", "sql"]
 build = "build.rs"
-include = ["src/*", "build.rs", "Cargo.toml", "LICENSE", "README.md", "THIRD_PARTY"]
+include = ["src/*", "build.rs", "errcodes.txt", "Cargo.toml", "LICENSE", "README.md", "THIRD_PARTY"]
 
 [lib]
 name = "postgres"
@@ -40,6 +40,7 @@ unix_socket = { version = "0.5", optional = true }
 uuid = { version = "0.1", optional = true }
 security-framework = { version = "0.1.2", optional = true }
 bit-vec = { version = "0.4", optional = true }
+eui48 = { version = "0.1", optional = true }
 
 [dev-dependencies]
 url = "0.5"

README.md

@@ -1,7 +1,7 @@
 # Rust-Postgres
 A native PostgreSQL driver for Rust.
 
-[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.11.1/postgres)
+[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.11.2/postgres)
 
 [![Build Status](https://travis-ci.org/sfackler/rust-postgres.png?branch=master)](https://travis-ci.org/sfackler/rust-postgres) [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
 
@@ -252,6 +252,13 @@ types. The driver currently supports the following conversions:
             <td>HashMap&lt;String, Option&lt;String&gt;&gt;</td>
             <td>HSTORE</td>
         </tr>
+        <tr>
+            <td>
+                <a href="https://github.com/abaumhauer/eui48">eui48::MacAddress</a>
+                (<a href="#optional-features">optional</a>)
+            </td>
+            <td>MACADDR</td>
+        </tr>
     </tbody>
 </table>
 
@@ -302,3 +309,9 @@ feature, which adds `ToSql` and `FromSql` implementations for `chrono`'s
 [BIT and VARBIT](http://www.postgresql.org/docs/9.4/static/datatype-bit.html)
 support is provided optionally by the `bit-vec` feature, which adds `ToSql` and
 `FromSql` implementations for `bit-vec`'s `BitVec` type.
+
+### MACADDR type
+
+[MACADDR](http://www.postgresql.org/docs/9.4/static/datatype-net-types.html#DATATYPE-MACADDR)
+support is provided optionally by the `eui48` feature, which adds `ToSql` and
+`FromSql` implementations for `eui48`'s `MacAddress` type.