# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343299482 -7200
# Node ID 0bccac92b6f17860d8ce8b58951e325cbf90efd4
# Parent  e5cf57bf6b47701f98fe498c181358ba13b241f1# Parent  e1f07d9d69376ff04941d066f15736f6e8280029
Merge commit '6667bc4' into rhel5

diff -r e5cf57bf6b47 -r 0bccac92b6f1 bin/ren
--- a/bin/ren	Thu Jul 26 10:39:57 2012 +0200
+++ b/bin/ren	Thu Jul 26 12:44:42 2012 +0200
@@ -325,7 +325,7 @@
   #720p
   $newname =~ s/(\(|\[) *(BD 1280x720|1280x720 8bit|1280x720 x264-Hi10P AAC|AT-X Hi10P 1280x720 H264|AT-X Hi10P 1280x720|1280x720 Hi10p|AT-X Hi10P 1280x720|1280x720 Hi10p AAC|AT-X 1280x720 H264|Hi10P 1280x720 H264|Hi10P 1280x720|1280x720 Hi10P|1280x720 5\.1|1280x720 x264 AAC|1280x720 H264 AAC|720p H264 AAC|1280x720|1280x720 H\.?264 AAC) *(\)|\])/[720p]/i;
   #720p BD
-  $newname =~ s/(\(|\[) *(BD\]\[720p-|BD, 720p, 10bit, AAC|BDRip 720p x264 FLAC|BDRip 720p|BD 720p DA|Blu-Ray 960x720 Dual Audio FLAC|BD, 720p|BD\]\[h264-720p\]\[FLAC|BD Hi10P 1280x720|BD, 720p, 10bit,|BD, 720, 10bit, AAC|BDrip 720p Vorbis|BD 720p Hi10P AAC|BD, 720p,|BD 720p H264-AAC|BDRip 720p|BD, 720p, ,|1280x720 BD|BD 1280x720 H264 AAC|BD 720p|BD 720p FLAC|BD 1280x720 H264 AAC) *(\)|\])/[720p BD]/i;
+  $newname =~ s/(\(|\[) *(BD 10-bit 1280x720 x264 AAC|BD\]\[720p-|BD, 720p, 10bit, AAC|BDRip 720p x264 FLAC|BDRip 720p|BD 720p DA|Blu-Ray 960x720 Dual Audio FLAC|BD, 720p|BD\]\[h264-720p\]\[FLAC|BD Hi10P 1280x720|BD, 720p, 10bit,|BD, 720, 10bit, AAC|BDrip 720p Vorbis|BD 720p Hi10P AAC|BD, 720p,|BD 720p H264-AAC|BDRip 720p|BD, 720p, ,|1280x720 BD|BD 1280x720 H264 AAC|BD 720p|BD 720p FLAC|BD 1280x720 H264 AAC) *(\)|\])/[720p BD]/i;
   #BD
   $newname =~ s/(\(|\[) *(Blu-Ray|BD 540p) *(\)|\])/[BD]/i;
   #576p
diff -r e5cf57bf6b47 -r 0bccac92b6f1 rc/vimrc
--- a/rc/vimrc	Thu Jul 26 10:39:57 2012 +0200
+++ b/rc/vimrc	Thu Jul 26 12:44:42 2012 +0200
@@ -43,4 +43,5 @@
   autocmd BufRead,BufNewFile .git/COMMIT_EDITMSG :set noet ts=8 nolist
   autocmd BufRead,BufNewFile .gitconfig :set noet ts=8 nolist
   autocmd BufRead,BufNewFile .git/config :set noet ts=8 nolist
+  autocmd BufRead,BufNewFile *.erb :set ft=eruby ts=2 et list
 endif