xrdb: Changes to 'master'

[Alan Coopersmith]

 man/xrdb.man |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ed086df97fc816dfeb792ac0094eaa8795177bf5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jun 30 09:11:12 2013 -0700

    Clarify .Xresources vs. .Xdefaults in man page
    
    Reported by John Feuerstein at
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649187
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>