<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/mastacontrola/ipxe master</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/ipxe/ipxe/pull/24'>https://github.com/ipxe/ipxe/pull/24</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Merge pull request #1 from ipxe/master</li>
  <li>Add ipxescript and modified configuration files.</li>
  <li>Commit the configuration files with our needed tweaks.</li>
  <li>Merge remote-tracking branch 'upstream/master'</li>
  <li>Merge remote-tracking branch 'upstream/master'</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/ipxe/ipxe/pull/24/files#diff-0">src/config/console.h</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/ipxe/ipxe/pull/24/files#diff-1">src/config/general.h</a>
    (50)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/ipxe/ipxe/pull/24/files#diff-2">src/config/settings.h</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/ipxe/ipxe/pull/24/files#diff-3">src/ipxescript</a>
    (3)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/ipxe/ipxe/pull/24.patch'>https://github.com/ipxe/ipxe/pull/24.patch</a></li>
  <li><a href='https://github.com/ipxe/ipxe/pull/24.diff'>https://github.com/ipxe/ipxe/pull/24.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/ipxe/ipxe/pull/24">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/709460__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcyMDUyMTk1MSwiZGF0YSI6eyJpZCI6MzY1NzA0NDR9fQ==--95ceb658d88d7ba7caccd0f72d69cba83417e402.gif" width="1" /></p>