Merge branch 'master' of cvs2:WP-Themes/PrestonFeather
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Dec 2014 19:48:42 +0000 (14:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Dec 2014 19:48:42 +0000 (14:48 -0500)
1  2 
header.php

diff --cc header.php
Simple merge