[LA-Policies] [linuxaustralia/constitution_and_policies] b8dfbb: Merging DebConf changes

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/linuxaustralia/constitution_and_policies
  Commit: b8dfbb633bdb7ad1d16dee39f746345b2b85cfd8
      https://github.com/linuxaustralia/constitution_and_policies/commit/b8dfbb633bdb7ad1d16dee39f746345b2b85cfd8
  Author: Francois Marier <francois at fmarier.org>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M code_of_conduct.md

  Log Message:
  -----------
  Merging DebConf changes

Credit for this patch goes to Margarita Manterola. Original patch at:

http://lists.debconf.org/lurker/message/20140904.221307.3c4b2a0c.en.html


  Commit: 043e78288a33615f8dca775ce0857c37e6a7f660
      https://github.com/linuxaustralia/constitution_and_policies/commit/043e78288a33615f8dca775ce0857c37e6a7f660
  Author: Chris Neugebauer <chrisjrn at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M code_of_conduct.md

  Log Message:
  -----------
  Clarify the meaning of "requires"


  Commit: abf17d0cae3d263b5861f405a065e89ea7227aaf
      https://github.com/linuxaustralia/constitution_and_policies/commit/abf17d0cae3d263b5861f405a065e89ea7227aaf
  Author: Joshua Hesketh <josh at nitrotech.org>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M code_of_conduct.md

  Log Message:
  -----------
  Merge pull request #5 from fmarier/patch-1

Merging DebConf changesMOTION by Francois that the amendments proposed in the pull request be merged   into the DebConf policy
SECONDED by Christopher Neugebauer
CARRIED unanimously


Compare: https://github.com/linuxaustralia/constitution_and_policies/compare/d39fe61fe8c0...abf17d0cae3d