Update config from master.

This commit is contained in:
Automated Commit 2014-10-04 09:00:06 -04:00
parent 5fd47da202
commit d3ccb61181

@ -1 +1 @@
Subproject commit 85dba1d5eee6a6865262c1d7239ec9f2c60f0484
Subproject commit de968af32a356a43922f0b1da477b795c78ce929