Branch: refs/heads/master
  Home:   https://github.com/dtaht/ceropackages-3.3
  Commit: da77c5d8546bb85c6b17e270f6c1680c793fb447
      https://github.com/dtaht/ceropackages-3.3/commit/da77c5d8546bb85c6b17e270f6c1680c793fb447
  Author: Dave Taht <dave.taht@bufferbloat.net>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M utils/cerowrt-chrome/files/etc/cerowrt/credits.html

  Log Message:
  -----------
  Added hopefully final credits file (for now)


  Commit: 2f4d7f1340ccd4e76f7431c06d5dafeb1627016d
      https://github.com/dtaht/ceropackages-3.3/commit/2f4d7f1340ccd4e76f7431c06d5dafeb1627016d
  Author: Dave Taht <dave.taht@bufferbloat.net>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    A net/babelm/Makefile
    A net/babelm/files/babeld.conf
    A net/babelm/files/babeld.config
    A net/babelm/files/babeld.init
    A net/babelm/patches/0001-Mark-packets-as-ECN-capable.patch
    R net/babelz/Makefile
    R net/babelz/files/babeld.conf
    R net/babelz/files/babeld.config
    R net/babelz/files/babeld.init
    R net/babelz/patches/0001-Mark-packets-as-ECN-capable.patch
    M net/bind-latest/Makefile
    M net/debloat/Makefile
    M net/debloat/files/debloat
    M net/debloat/files/debloat.hotplug
    A net/debloat/files/simple_qos.sh
    M net/kmod-tcp-ledbat/Makefile
    R net/kmod-tcp-ledbat/patches/0001-Disable-debugging-by-default.patch
    A net/minissdpd/Makefile
    A net/minissdpd/files/minissdpd.config
    A net/minissdpd/files/minissdpd.iface.hotplug
    A net/minissdpd/files/minissdpd.init
    M net/miniupnpd/Makefile
    M net/miniupnpd/files/miniupnpd.iface.hotplug
    M net/miniupnpd/files/miniupnpd.init
    M net/netperf-latest/Makefile
    M net/ntpd/Makefile
    M net/openhip/Makefile
    M net/polipo/Makefile
    M net/quagga/Makefile
    M net/quagga/files/babeld.conf
    A net/quagga/patches/900-Arbitrarily-ECN-enable-babel.patch
    A net/scamper/patches/002-ecn-detect.patch
    M utils/gnugol/Makefile

  Log Message:
  -----------
  Merge branch 'master' of github.com:dtaht/ceropackages-3.3

Conflicts:
	utils/cerowrt-chrome/files/etc/cerowrt/credits.html


Compare: https://github.com/dtaht/ceropackages-3.3/compare/2b70ca439d65...2f4d7f1340cc