Sync from f90-iface

author Stefan Monnier <monnier@iro.umontreal.ca>

Wed, 21 Aug 2013 17:17:06 +0000 (13:17 -0400)

committer Stefan Monnier <monnier@iro.umontreal.ca>

Wed, 21 Aug 2013 17:17:06 +0000 (13:17 -0400)
author Stefan Monnier <monnier@iro.umontreal.ca>
Wed, 21 Aug 2013 17:17:06 +0000 (13:17 -0400)
committer Stefan Monnier <monnier@iro.umontreal.ca>
Wed, 21 Aug 2013 17:17:06 +0000 (13:17 -0400)
diff --cc packages/f90-interface-browser/README.org

index 0000000000000000000000000000000000000000,e620b4933b1f2fdd8a7d6fd3491ed6a26e25cc8a..e620b4933b1f2fdd8a7d6fd3491ed6a26e25cc8a

mode 000000,100644..100644
--- /dev/null
--- 2/README.org
+++ b/packages/f90-interface-browser/README.org
diff --cc packages/f90-interface-browser/f90-interface-browser.el
Simple merge
author	Stefan Monnier <monnier@iro.umontreal.ca>
	Wed, 21 Aug 2013 17:17:06 +0000 (13:17 -0400)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Wed, 21 Aug 2013 17:17:06 +0000 (13:17 -0400)
		1	2
packages/f90-interface-browser/README.org	patch \|	\|	diff2 \|	blob \| history
packages/f90-interface-browser/f90-interface-browser.el	patch \|	diff1 \|	diff2 \|	blob \| history