Merge commit 'remotes/jmtd/friendly_markup_names'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 16 May 2009 14:37:15 +0000 (10:37 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 16 May 2009 14:37:15 +0000 (10:37 -0400)
commit251fe8dae6e0bdf5a3d3ad4fc413b2163fecbb75
tree92c9ad76784ea2bfd03c23e257ad4667c655c377
parentd96bedef6b65d61f05c2e204292f67b68279e7b3
parenteba9b862b2f7d346dfffcd5576cd96fce9dd239d
Merge commit 'remotes/jmtd/friendly_markup_names'