aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2011-07-29 16:39:34 +0200
committerJoakim Verona2011-07-29 16:39:34 +0200
commit94e784ce3567d8c87d8439a3718013de22a5e163 (patch)
treedc9ead34e25f3d19339919cff5ebbf8f0b52f76d /src
parent5d9d21d398fb7297e719ecbe737b8bd6acc7fd51 (diff)
parente5d76069f08b5ccb5d10edd5242b363fd92aacac (diff)
parent096a60526593c1571da1ec9137b878ad8178f833 (diff)
downloademacs-94e784ce3567d8c87d8439a3718013de22a5e163.tar.gz
emacs-94e784ce3567d8c87d8439a3718013de22a5e163.zip
merge upstream