code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

author	Joakim Verona <joakim@verona.se>
	Mon, 27 May 2013 21:14:19 +0000 (23:14 +0200)
committer	Joakim Verona <joakim@verona.se>
	Mon, 27 May 2013 21:14:19 +0000 (23:14 +0200)
commit	5cf62a1639c5993c1fd6b532f92325b28a13ee79
tree	d67d1c7c583947f164ee7494601d5c9decbd6b0f	tree
parent	3b2a9bcfc08c74d95f46d634fadc758decb1c2b0	commit \| diff
parent	6ef3db10430c653e302ca5983ade6f8eaa186f85	commit \| diff

Merge remote-tracking branch 'origin/trunk' into xwidget

Conflicts:
ChangeLog
lisp/ChangeLog
lisp/progmodes/octave.el
src/Makefile.in