commit 0d2baab1e152339fca63bf05198882ab25f73dd6
Merge: 6b168d3 bb34987
Author: root <root@ip-97-74-74-40.ip.secureserver.net>
Date:   Wed Sep 14 15:42:47 2011 -0700

    Merge branch 'endpointmanager/1.2' of git://github.com/Jaybee-/bluebox

commit bb34987bb0133d862f135d238dc93b2b5a8d0127
Author: Jort Bloem <jort.bloem@btg.co.nz>
Date:   Thu Sep 15 10:33:36 2011 +1200

    Remove the tftppath option - this will be replaced with a tftp -> http proxy

commit 6b168d37427c92f4dd873522c82cecc6d3352854
Merge: 2545397 05ad3a3
Author: root <root@ip-97-74-74-40.ip.secureserver.net>
Date:   Wed Sep 14 15:18:39 2011 -0700

    Merge branch 'master' of git://github.com/tm1000/Provisioner

commit b8dd9e5856099b119ce482141bfb7f99c3955f56
Author: Jort Bloem <jort.bloem@btg.co.nz>
Date:   Thu Sep 15 10:03:49 2011 +1200
:
commit 0d2baab1e152339fca63bf05198882ab25f73dd6
Merge: 6b168d3 bb34987
Author: root <root@ip-97-74-74-40.ip.secureserver.net>
Date:   Wed Sep 14 15:42:47 2011 -0700

    Merge branch 'endpointmanager/1.2' of git://github.com/Jaybee-/bluebox

commit bb34987bb0133d862f135d238dc93b2b5a8d0127
Author: Jort Bloem <jort.bloem@btg.co.nz>
Date:   Thu Sep 15 10:33:36 2011 +1200

    Remove the tftppath option - this will be replaced with a tftp -> http proxy.

commit 6b168d37427c92f4dd873522c82cecc6d3352854
Merge: 2545397 05ad3a3
Author: root <root@ip-97-74-74-40.ip.secureserver.net>
Date:   Wed Sep 14 15:18:39 2011 -0700

    Merge branch 'master' of git://github.com/tm1000/Provisioner

commit b8dd9e5856099b119ce482141bfb7f99c3955f56
Author: Jort Bloem <jort.bloem@btg.co.nz>
Date:   Thu Sep 15 10:03:49 2011 +1200

    Some calls seem to be sticking around in the "HANGUP" state - filter these out.

commit 9e9aea8d52f0d50769303d58d745de40d6a37f5a
Author: Jort Bloem <jort.bloem@btg.co.nz>
Date:   Thu Sep 15 10:01:44 2011 +1200

    if a file can't be found, this gives a hint as to which file it's looking for.

commit 05ad3a3533b8ada7abd35061fe43b579ba6a6636
Author: Andrew Nagy <andrew.nagy@the159.com>
Date:   Wed Sep 14 00:52:37 2011 -0700

    Changes to Polycoms

commit 3a844f9ec925133b6a4d4dcecaef71fbc771a814
Author: Andrew Nagy <andrew.nagy@the159.com>
Date:   Wed Sep 14 00:35:21 2011 -0700

    Fixed paths for cisco SPA

commit 863af0bf959f3ab9891f3c311e2255be5a895a75
Author: Andrew Nagy <andrew.nagy@the159.com>
Date:   Wed Sep 14 00:30:23 2011 -0700

    More fixes after email discussion

commit b51fe933f2ef1457a5b82c191573d1bf280cbfdf
Author: Andrew Nagy <andrew.nagy@the159.com>
Date:   Wed Sep 14 00:29:46 2011 -0700

    Fixing this after email discussion with jaybee

commit 6b02d8b79a4e861d2313e1c9dbf9bfdb42541b0d
Author: www-data <www-data@provisioner.(none)>
Date:   Wed Sep 14 00:20:02 2011 -0700