Changeset 17045

Timestamp:
03/12/10 11:39:18 (5 months ago)
Author:
jacalvo@…
Message:

NN: merge r17044 from trunk

Location:
branches/1.4/docs/en/user/images
Files:
11 modified

  • branches/1.4/docs/en/user/images

    • Property svn:mergeinfo set to
      /branches/iclerencia/dashboard/docs/en/user/images:10750-11795,11813-11956
      /branches/iclerencia/ebox-seville/docs/en/user/images:13632-14100
      /branches/iclerencia/menu-ng/docs/en/user/images:12030-12212
      /branches/iclerencia/module/docs/en/user/images:12005-12256
      /branches/iclerencia/samba-logging/docs/en/user/images:13337-13366
      /branches/iclerencia/usercorner-reloaded/docs/en/user/images:12386-12470
      /branches/jacalvo/wan-failover/docs/en/user/images:14040-14133
      /branches/jbernal/eboxhq/docs/en/user/images:12473-12474
      /branches/josh/ldap-uid-change/docs/en/user/images:13873-13900
      /branches/josh/new-samba/docs/en/user/images:13210-13300
      /branches/jsalamero/service-certificates/docs/en/user/images:13586-13960
      /branches/juruen/model-optimization-1.1/docs/en/user/images:12356-12462
      /branches/juruen/model-optimization-1.1.rb1/docs/en/user/images:12463-12495
      /branches/juruen/model-optimization-1.1.rb2/docs/en/user/images:12496-12510
      /branches/juruen/model-optimization-1.1.rb4/docs/en/user/images:12511-12537
      /branches/juruen/sha1-passwords/docs/en/user/images:11999-12490
      /trunk/docs/en/user/images:16843-16860,16947,16999,17044

  • branches/1.4/docs/en/user/images/mail/usercorner-external-mail.png

    • Property svn:mergeinfo changed from /trunk/docs/en/user/images/mail/usercorner-external-mail.png:16843-16860,16947,16999 to /trunk/docs/en/user/images/mail/usercorner-external-mail.png:16843-16860,16947,16999,17044