From: Jameson Graef Rollins Date: Sun, 1 Feb 2009 01:12:56 +0000 (-0500) Subject: Merge commit 'dkg/master' X-Git-Tag: monkeysphere_0.23~156^2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4c566d5a1dd25d87d07dac1459a395321b9a5ef;p=monkeysphere.git Merge commit 'dkg/master' --- e4c566d5a1dd25d87d07dac1459a395321b9a5ef diff --cc src/subcommands/ma/add-certifier index 0484228,9ad0515..0c3c647 mode 100755,100644..100644 --- a/src/subcommands/ma/add-certifier +++ b/src/subcommands/ma/add-certifier diff --cc src/subcommands/ma/list-certifiers index 26989c6,83f7786..e37485e mode 100755,100644..100644 --- a/src/subcommands/ma/list-certifiers +++ b/src/subcommands/ma/list-certifiers diff --cc src/subcommands/ma/remove-certifier index 2100b2d,59d3f0c..560281d mode 100755,100644..100644 --- a/src/subcommands/ma/remove-certifier +++ b/src/subcommands/ma/remove-certifier diff --cc src/subcommands/ma/update-users index d3a72dc,0335e31..73685f6 mode 100755,100644..100644 --- a/src/subcommands/ma/update-users +++ b/src/subcommands/ma/update-users diff --cc src/subcommands/mh/publish-key index 7baefc4,6c69569..b7ab01d mode 100755,100644..100644 --- a/src/subcommands/mh/publish-key +++ b/src/subcommands/mh/publish-key