Merge commit 'd827bb511203a64da3ae5cc6910b87b7c99d233b'

author Daiki Ueno <ueno@gnu.org>

Wed, 10 Feb 2016 08:29:50 +0000 (17:29 +0900)

committer Daiki Ueno <ueno@gnu.org>

Wed, 10 Feb 2016 08:29:50 +0000 (17:29 +0900)
author Daiki Ueno <ueno@gnu.org>
Wed, 10 Feb 2016 08:29:50 +0000 (17:29 +0900)
committer Daiki Ueno <ueno@gnu.org>
Wed, 10 Feb 2016 08:29:50 +0000 (17:29 +0900)
diff --cc packages/gnome-c-style/README.md
Simple merge
diff --cc packages/gnome-c-style/gnome-c-align.el
Simple merge
diff --cc packages/gnome-c-style/gnome-c-snippet.el
Simple merge
diff --cc packages/gnome-c-style/gnome-c-tests.el
Simple merge
author	Daiki Ueno <ueno@gnu.org>
	Wed, 10 Feb 2016 08:29:50 +0000 (17:29 +0900)
committer	Daiki Ueno <ueno@gnu.org>
	Wed, 10 Feb 2016 08:29:50 +0000 (17:29 +0900)
		1	2
packages/gnome-c-style/README.md	patch \|	diff1 \|	diff2 \|	blob \| history
packages/gnome-c-style/gnome-c-align.el	patch \|	diff1 \|	diff2 \|	blob \| history
packages/gnome-c-style/gnome-c-snippet.el	patch \|	diff1 \|	diff2 \|	blob \| history
packages/gnome-c-style/gnome-c-tests.el	patch \|	diff1 \|	diff2 \|	blob \| history