Merge remote-tracking branch 'alezost/indent+highlight'
commit697d0ac94d2d63bf755931122beafcbe1304b321
authorJose Antonio Ortega Ruiz <jao@gnu.org>
Mon, 5 Oct 2015 13:40:17 +0000 (5 15:40 +0200)
committerJose Antonio Ortega Ruiz <jao@gnu.org>
Mon, 5 Oct 2015 13:40:17 +0000 (5 15:40 +0200)
tree1428508e9c9348a13f15442aead67af21700ab3e
parent373b9a499dd4f26886c0e54612e638dd529bcc6f
parent5b2bd49f2c9bb7cea8c63485e40d267ea27bace0
Merge remote-tracking branch 'alezost/indent+highlight'