diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
| commit | bdcbded3236fa76f011c8d594c4b261c8b816199 (patch) | |
| tree | 23d9886731ccbf52e8f3d3d9ccc0cfeb8dbb273a /schemas/xinclude.xsd | |
| parent | 864bce0515b85f206381ac033875b12d06a2540d (diff) | |
| parent | 5c9cd24767bcbc8cdb39eebf2fd81e9c814c01af (diff) | |
| download | bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.gz bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.bz2 bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.zip | |
Merge branch 'maint'
Conflicts:
doc/client/tools/actions.txt
schemas/authorizedkeys.xsd
src/lib/Bcfg2/Client/Frame.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
Diffstat (limited to 'schemas/xinclude.xsd')
0 files changed, 0 insertions, 0 deletions