[Mageia-sysadm] [232] merge r124 from live

[root at mageia.org]

Revision: 232
Author:   misc
Date:     2011-01-06 21:03:09 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
merge r124 from live

Modified Paths:
--------------
    identity/CatDap/trunk/catdap.yml

Modified: identity/CatDap/trunk/catdap.yml
===================================================================
--- identity/CatDap/trunk/catdap.yml	2011-01-06 17:30:05 UTC (rev 231)
+++ identity/CatDap/trunk/catdap.yml	2011-01-06 20:03:09 UTC (rev 232)
@@ -78,6 +78,7 @@
                        - roomNumber
                        - secretary
                        - mailForwardingAddress
+                       - sshPublicKey
 
 # Currently not used, we only respect editable_attrs
         uneditable_attrs:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110106/02f2ce9e/attachment-0001.html>