# HG changeset patch
# User nanaya <me@myconan.net>
# Date 1428954532 -32400
# Node ID 6084b6b425adf3fa6979d56bd4792344a5c21962
# Parent  138ee2cd2179a4aac67a131abe53eb167b7eadfb# Parent  a056f6920d8e47c313e9cb724f1d7e3d2674c8cc
Merge from remote.

diff -r 138ee2cd2179 -r 6084b6b425ad rc/bashrc
--- a/rc/bashrc	Tue Apr 14 04:47:54 2015 +0900
+++ b/rc/bashrc	Tue Apr 14 04:48:52 2015 +0900
@@ -268,8 +268,8 @@
 unset _rm
 
 if command -v curl > /dev/null 2>&1; then
-  alias 0p="gzip | curl 'http://0paste.com/pastes.txt' -F 'paste[paste_gzip]=<-'"
-  alias 0pp="gzip | curl 'http://0paste.com/pastes.txt' -F 'paste[is_private]=1' -F 'paste[paste_gzip]=<-'"
+  alias 0p="gzip | curl 'http://0paste.tk/pastes.txt' -F 'paste[paste_gzip]=<-'"
+  alias 0pp="gzip | curl 'http://0paste.tk/pastes.txt' -F 'paste[is_private]=1' -F 'paste[paste_gzip]=<-'"
 fi
 
 if command -v tmux > /dev/null 2>&1; then
diff -r 138ee2cd2179 -r 6084b6b425ad vendor/vim-syntax/blade.vim
--- a/vendor/vim-syntax/blade.vim	Tue Apr 14 04:47:54 2015 +0900
+++ b/vendor/vim-syntax/blade.vim	Tue Apr 14 04:48:52 2015 +0900
@@ -13,9 +13,9 @@
 silent! unlet b:current_syntax
 
 " Echos
-syn region bladeUnescapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{!!/ end=/!!}\s*/ oneline contains=@phpClTop containedin=ALLBUT,bladeComment
-syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{\@!/ end=/}}\s*/ oneline contains=@phpClTop containedin=ALLBUT,bladeComment
-syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{{\@!/ end=/}}}/ oneline contains=@phpClTop containedin=ALLBUT,bladeComment
+syn region bladeUnescapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{!!/ end=/!!}\s*/ contains=@phpClTop containedin=ALLBUT,bladeComment
+syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{\@!/ end=/}}\s*/ contains=@phpClTop containedin=ALLBUT,bladeComment
+syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{{\@!/ end=/}}}/ contains=@phpClTop containedin=ALLBUT,bladeComment
 
 " Structures
 syn match bladeStructure /\s*@\(else\|empty\|endfor\|endforeach\|endforelse\|endif\|endpush\|endsection\|endunless\|endwhile\|overwrite\|show\|stop\)\>/