log

age author description
Mon, 26 Aug 2013 17:52:00 +0900 edogawaconan Also ignores *.pyc.
Mon, 26 Aug 2013 17:51:18 +0900 edogawaconan Added random password generator.
Mon, 26 Aug 2013 17:50:25 +0900 edogawaconan More aliases.
Mon, 22 Jul 2013 12:40:55 +0900 edogawaconan Sort syntax list.
Mon, 22 Jul 2013 12:40:24 +0900 edogawaconan Add slim syntax to vim.
Sat, 20 Jul 2013 04:25:06 +0900 edogawaconan More informative touch.
Sun, 14 Jul 2013 02:05:55 +0900 edogawaconan Add global hgignore.
Sun, 14 Jul 2013 02:04:45 +0900 edogawaconan Use "old" commit identity for git.
Sun, 14 Jul 2013 02:01:09 +0900 edogawaconan Add test for $HOME writability.
Wed, 26 Jun 2013 01:09:35 +0900 edogawaconan Change username for git.
Thu, 06 Jun 2013 19:29:44 +0900 Edho Arief Use record extension by default.
Thu, 06 Jun 2013 19:29:27 +0900 Edho Arief Add games to PATH.
Fri, 24 May 2013 18:47:59 +0900 Edho Arief Support for json
Tue, 14 May 2013 16:04:09 +0900 Edho Arief [bashrc] Private paste alias
Mon, 13 May 2013 13:22:40 +0900 Edho Arief 0paste without base64
Wed, 01 May 2013 15:09:40 +0900 Edho Arief Resort prioritized paths.
Mon, 29 Apr 2013 14:27:44 +0900 Edho Arief Add FreeBSD tcsh compatibility.
Fri, 08 Mar 2013 15:58:25 +0900 Edho Arief Hopefully better history stuff.
Tue, 05 Mar 2013 11:28:14 +0900 Edho Arief Also enfore LC_CTYPE.
Mon, 04 Mar 2013 13:36:59 +0900 Edho Arief Add macports path.
Mon, 18 Feb 2013 12:26:11 +0900 Edho Arief Enable convert by default.
Mon, 18 Feb 2013 12:25:40 +0900 Edho Arief Enable progress by default.
Mon, 18 Feb 2013 12:25:24 +0900 Edho Arief hgext isn't needed.
Mon, 18 Feb 2013 12:21:20 +0900 Edho Arief Add global gitignore.
Mon, 18 Feb 2013 12:19:01 +0900 Edho Arief Cleanup whitespace
Fri, 15 Feb 2013 18:18:30 +0900 Edho Arief config.ru is ruby file.
Fri, 15 Feb 2013 18:18:18 +0900 Edho Arief FreeBSD grep is GNU grep. Well, up to 9.x.
Fri, 08 Feb 2013 19:03:49 +0900 Edho Arief Color all those gits!
Fri, 08 Feb 2013 00:20:40 +0700 Edho Arief Always start editing git commit message from line 1.
Fri, 08 Feb 2013 00:19:45 +0700 Edho Arief More rules.
Fri, 01 Feb 2013 19:39:27 +0700 Edho Arief Added git co alias.
Wed, 23 Jan 2013 09:40:39 +0700 Edho Arief Testing for function never returns true. Replaced with autocmd.
Tue, 22 Jan 2013 23:09:52 +0700 Edho Arief Added hgignore.
Mon, 21 Jan 2013 10:25:33 +0700 Edho Arief Back to dark theme for compatibility with non-personal systems.
Mon, 21 Jan 2013 07:58:54 +0700 Edho Arief [bin/ren] More rules.
Sun, 20 Jan 2013 15:10:39 +0700 Edho Arief [bin/ren] More rules.
Thu, 17 Jan 2013 00:34:57 +0700 Edho Arief Even more rules.
Thu, 17 Jan 2013 00:15:12 +0700 Edho Arief [bin/ren] Updated rules.
Mon, 07 Jan 2013 18:43:23 +0700 Edho Arief [bin/rename] Added more rules.
Sun, 06 Jan 2013 13:52:11 +0300 Edho Arief Automated pgsql yum version detect.
Sun, 06 Jan 2013 13:28:24 +0300 Edho Arief Added enterprisedb postgres.
Sun, 06 Jan 2013 13:28:05 +0300 Edho Arief Added p7zip.
Sun, 30 Dec 2012 02:17:00 +0700 Edho Arief Fancier tmux styles.
Sun, 30 Dec 2012 02:00:27 +0700 Edho Arief Updated the uncolored prompt style.
Sun, 30 Dec 2012 01:56:46 +0700 Edho Arief Different, more compact style of prompt.
Sun, 30 Dec 2012 01:56:20 +0700 Edho Arief Full path on prompt.
Sun, 30 Dec 2012 01:48:14 +0700 Edho Arief Tmux color updates.
Sat, 29 Dec 2012 22:08:33 +0700 Edho Arief Don't fold by default.
Sat, 29 Dec 2012 22:07:00 +0700 Edho Arief Added foldmethod setting.
Sat, 29 Dec 2012 22:02:33 +0700 Edho Arief Always map _cs.
Sat, 29 Dec 2012 21:51:45 +0700 Edho Arief Added nerdtree install script.
Sat, 29 Dec 2012 21:51:34 +0700 Edho Arief Ensure there's no vim-rails already installed.
Sat, 29 Dec 2012 21:48:31 +0700 Edho Arief -u, duh.
Sat, 29 Dec 2012 21:46:09 +0700 Edho Arief Added vim-rails installer script.
Sat, 29 Dec 2012 21:44:44 +0700 Edho Arief Pathogen in vim.
Sat, 29 Dec 2012 21:41:52 +0700 Edho Arief Various vimrc cleanup.
Fri, 28 Dec 2012 09:09:28 -0800 Edho Arief Switch color default to light.
Wed, 19 Dec 2012 05:35:43 +0000 Edho Arief Added compatibility with joyent's smartos.
Tue, 11 Dec 2012 23:36:20 +0700 Edho Arief Even more rules.
Tue, 11 Dec 2012 23:31:18 +0700 Edho Arief [bin/ren] More rules.
Tue, 11 Dec 2012 16:15:34 -0500 Edho Arief Added PATH for pgdg 9.2.
Wed, 05 Dec 2012 02:33:47 -0800 Edho Arief Disable features on vim basic.
Wed, 28 Nov 2012 23:03:16 +0700 Edho Arief Sorted dotfile installation.
Wed, 28 Nov 2012 23:02:38 +0700 Edho Arief Added gemrc.
Wed, 28 Nov 2012 23:00:57 +0700 Edho Arief [rc/bashrc] 0paste gzip alias
Fri, 23 Nov 2012 10:40:53 -0500 Edho Arief Less quotes.
Fri, 23 Nov 2012 10:39:38 -0500 Edho Arief Don't set lc_messages to utf-8. Just use plain C.
Thu, 15 Nov 2012 01:03:52 +0700 Edho Arief Add restore cursor position for vim.
Wed, 14 Nov 2012 03:41:40 +0000 Edho Arief [rc/gitconfig] Use current instead of simple for older git compat.
Mon, 12 Nov 2012 16:59:35 +0700 Edho Arief Added syntax highlight for coffeescript.
Sun, 11 Nov 2012 14:59:41 +0700 Edho Arief [ren] More rules.
Sun, 11 Nov 2012 14:59:06 +0700 Edho Arief [gitconfig] Set default push mode.
Fri, 02 Nov 2012 13:54:50 -0400 Edho Arief Prioritize colorls in openbsd.
Sun, 28 Oct 2012 20:07:40 +0700 Edho Arief Removed extraneous space.
Fri, 26 Oct 2012 18:58:56 +0700 Edho Arief Removed useless script (mgren).
Fri, 26 Oct 2012 18:57:13 +0700 Edho Arief A bit of documentation.
Mon, 08 Oct 2012 15:29:49 +0700 Edho Arief Removes -j15$ from LESS params.
Mon, 08 Oct 2012 08:41:58 +0700 Edho Arief Add alias for zeropaste posting.
Tue, 04 Sep 2012 09:30:40 +0700 Edho Arief Merge remote-tracking branch 'origin/master' into rhel5
Tue, 04 Sep 2012 10:23:37 +0700 Edho Arief Merge remote-tracking branch 'origin/master'
Mon, 27 Aug 2012 18:04:31 +0700 Edho Arief [bin/ren] More rules.
Sun, 12 Aug 2012 14:27:41 +0700 Edho Arief Merge branch 'master' of http://github.com/edogawaconan/ecos
Thu, 09 Aug 2012 17:16:29 +0700 Edho Arief Added perl rename from debian system.
Sun, 12 Aug 2012 14:26:27 +0700 Edho Arief Uses grep instead of egrep
Tue, 04 Sep 2012 10:22:46 +0700 Edho Arief Moved less configuration declaration to environment variable.
Wed, 01 Aug 2012 15:28:42 +0700 Edho Arief Merge branch 'master' into rhel5
Wed, 01 Aug 2012 15:17:56 +0700 Edho Arief Added scss vim syntax support.
Fri, 27 Jul 2012 13:44:42 +0700 Edho Arief [bin/ren] More rules.
Thu, 26 Jul 2012 12:44:42 +0200 Edho Arief Merge commit '6667bc4' into rhel5
Thu, 26 Jul 2012 17:44:26 +0700 Edho Arief Enforce filetype eruby.
Thu, 26 Jul 2012 16:01:40 +0700 Edho Arief More rules.
Thu, 26 Jul 2012 10:39:57 +0200 Edho Arief Merge commit 'd029961' into rhel5
Thu, 26 Jul 2012 15:39:31 +0700 Edho Arief More PATH adjustment.
Thu, 26 Jul 2012 12:37:39 +0700 Edho Arief Added comment.
Thu, 26 Jul 2012 12:37:14 +0700 Edho Arief PATH adjustment.
Wed, 25 Jul 2012 04:36:02 +0700 Edho Arief Merge branch 'master' of http://github.com/edogawaconan/ecos
Wed, 25 Jul 2012 04:35:37 +0700 Edho Arief Better directory symlink tab completion.
Wed, 25 Jul 2012 04:35:22 +0700 Edho Arief Rules~
Tue, 24 Jul 2012 17:56:24 -0400 Edho Arief Merge commit '61bf33d' into rhel5
Tue, 24 Jul 2012 17:51:52 -0400 Edho Arief Unalias everything first.
Mon, 16 Jul 2012 21:03:18 +0200 Edho Arief Branched, removed progress extension on rhel5.
Tue, 03 Jul 2012 21:34:04 +0700 Edho Arief Readd bookmark's track.current in hg.
Tue, 03 Jul 2012 21:29:29 +0700 Edho Arief Enable progress by default.
Tue, 03 Jul 2012 21:28:07 +0700 Edho Arief Added color for hg.
Tue, 03 Jul 2012 21:20:07 +0700 Edho Arief Added alias, added graphlog extension.
Tue, 03 Jul 2012 08:22:55 +0700 Edho Arief Also nuke bash-completion.
Sun, 01 Jul 2012 11:54:34 +0700 Edho Arief Added rules.
Sat, 30 Jun 2012 23:24:04 +0700 Edho Arief Nuke all custom functions.
Thu, 28 Jun 2012 09:09:37 +0700 Edho Arief Reduced limit to 100.
Thu, 28 Jun 2012 09:08:27 +0700 Edho Arief [bin/ren] Replaced tabs with spaces
Sun, 17 Jun 2012 09:57:17 +0000 Edho Arief Added vim rule for fstab.
Thu, 14 Jun 2012 11:20:30 +0700 Edho Arief Added additional path for pkgsrc (NetBSD/DragonFly).
Mon, 04 Jun 2012 16:38:10 +0700 Edho Arief Grep in color for NetBSD/DragonFly.
Mon, 04 Jun 2012 16:32:59 +0700 Edho Arief Unset the test variable.
Mon, 04 Jun 2012 15:41:48 +0700 Edho Arief Better test for rm aliasing
Sat, 02 Jun 2012 17:07:57 +0700 Edho Arief Added readme because I can.
Thu, 31 May 2012 23:20:52 +0700 Edho Arief Update to latest ren (more rules).
Thu, 31 May 2012 23:20:10 +0700 Edho Arief More git exception on vim.
Thu, 31 May 2012 23:10:43 +0700 Edho Arief Update repo files to git.
Thu, 31 May 2012 23:01:34 +0700 Edho Arief Set default locale for man(1) to C.
Fri, 01 Jun 2012 05:22:38 +0700 Edho Arief Added some aliases for git.
Fri, 01 Jun 2012 05:21:43 +0700 Edho Arief Even more vimrc rules (git commit message).
Fri, 01 Jun 2012 05:20:49 +0700 Edho Arief More predefined vim file.
Fri, 01 Jun 2012 05:20:35 +0700 Edho Arief Added gitconfig.
Tue, 29 May 2012 17:44:45 +0700 Edho Arief Default LC_COLLATE to C.
Tue, 29 May 2012 17:43:03 +0700 Edho Arief Set default style to compact, added rebase option as default.
Sat, 26 May 2012 20:58:48 +0700 Edho Arief Gemfile is ruby.
Sat, 26 May 2012 16:10:27 +0000 Edho Arief The color prompt is broken-ish in DFBSD.
Sat, 26 May 2012 11:06:44 +0000 Edho Arief NetBSD and DFBSD use similar package directory structure (pkgsrc).
Thu, 24 May 2012 21:11:18 +0700 Edho Arief vim per file control.
Tue, 01 May 2012 23:46:07 +0700 Edho Arief [bin/ren] More rules.
Mon, 16 Apr 2012 20:03:13 +0700 Edho Arief [bin/ren] Even more rules.
Mon, 16 Apr 2012 19:56:47 +0700 Edho Arief [rc/inputrc] Preferred hotkey - ^D should always list possible completions.
Fri, 06 Apr 2012 13:18:26 +0700 Edho Arief More rules.
Tue, 03 Apr 2012 16:31:29 +0000 Edho Arief [rc/bashrc] Search for python26 in local dirs, too.
Tue, 03 Apr 2012 11:02:19 +0000 Edho Arief Additional structure.
Sun, 25 Mar 2012 18:21:30 +0700 Edho Arief [bin/ren] Even more rules.
Sun, 25 Mar 2012 16:56:14 +0700 Edho Arief [rc/bashrc] Better color for solarized and general (blue -> cyan).
Sun, 25 Mar 2012 16:42:46 +0700 Edho Arief [rc/cshrc] Better LSCOLORS, prompt.
Sun, 25 Mar 2012 02:14:56 +0700 Edho Arief [tmux] Try default green status bar color.
Sat, 24 Mar 2012 19:37:42 +0700 Edho Arief [vimrc] set list for tab-squashing.
Wed, 21 Mar 2012 13:01:55 +0700 Edho Arief Cosmetics.
Tue, 20 Mar 2012 21:08:55 +0700 Edho Arief More rules.
Tue, 20 Mar 2012 13:17:13 +0700 Edho Arief [rc/vimrc] Forces transparent background for vim on gnome-terminal.
Mon, 19 Mar 2012 12:54:41 +0700 Edho Arief Merge~
Mon, 19 Mar 2012 01:30:18 +0700 Edho Arief Merge.
Mon, 19 Mar 2012 01:29:48 +0700 Edho Arief [rc/bash] Solaris: additional path, removed useless test.
Mon, 19 Mar 2012 12:52:12 +0700 Edho Arief Canonical name for configs.
Mon, 19 Mar 2012 12:49:40 +0700 Edho Arief [rc/hg] mq by default.
Mon, 19 Mar 2012 04:36:45 +0700 Edho Arief tmux 1.1 compatibility.
Mon, 19 Mar 2012 04:14:30 +0700 Edho Arief Added test to verify vim version (lite or full).
Sun, 18 Mar 2012 16:47:46 +0700 Edho Arief Merge.
Wed, 07 Mar 2012 13:16:10 +0700 Edho Arief [ren] More rules.
Sun, 18 Mar 2012 16:24:28 +0700 Edho Arief [rc/bash] Better test for Solaris environment.
Sun, 18 Mar 2012 16:02:08 +0700 Edho Arief [setup] Returning solaris compatibility.
Sun, 18 Mar 2012 13:23:06 +0700 Edho Arief Fixed sed test to be compatible with POSIX regex.
Sun, 18 Mar 2012 13:21:02 +0700 Edho Arief [moefetch] Support for https.
Sun, 18 Mar 2012 13:16:54 +0700 Edho Arief Even more merges >_>
Sun, 18 Mar 2012 05:08:21 +0000 Edho Arief More merges!
Sun, 18 Mar 2012 11:38:57 +0700 Edho Arief Revert to original BSD ls colorscheme since it's better suited for solarized.
Sun, 18 Mar 2012 11:37:14 +0700 Edho Arief solarized-compatible tcsh prompt.
Sun, 18 Mar 2012 11:36:34 +0700 Edho Arief solarized-compatible bash prompt.
Sun, 18 Mar 2012 11:36:01 +0700 Edho Arief A bit clearer info on Solaris.
Sun, 18 Mar 2012 11:34:47 +0700 Edho Arief Gattai!
Sun, 18 Mar 2012 11:33:25 +0700 Edho Arief Support for solarized vim color scheme.
Sun, 18 Mar 2012 11:30:42 +0700 Edho Arief Solarized ls colors!
Sun, 04 Mar 2012 12:20:33 +0000 Edho Arief Converting from integer, not string.
Mon, 12 Mar 2012 08:50:32 +0700 Edho Arief moefetch default site updated to yande.re.
Wed, 07 Mar 2012 14:17:51 +0700 Edho Arief Merge.
Wed, 07 Mar 2012 19:14:40 +0700 Edho Arief Always use bookmarks for hg.
Wed, 29 Feb 2012 17:48:05 +0000 Edho Arief Use SI whenever possible. Use 1KiB instead otherwise.
Mon, 20 Feb 2012 13:15:35 +0000 Edho Arief Merge.
Sun, 19 Feb 2012 06:27:32 +0000 Edho Arief Reset LS_COLORS by default.
Sun, 19 Feb 2012 06:26:52 +0000 Edho Arief Merge
Wed, 15 Feb 2012 16:21:11 +0300 Edho Arief [moefetch] Added basic safeguard
Mon, 20 Feb 2012 13:15:02 +0000 Edho Arief New rubygems path.
Thu, 16 Feb 2012 17:48:04 +0700 Edho Arief Merge
Thu, 09 Feb 2012 09:12:18 +0700 Edho Arief Forgot the other wget.
Thu, 09 Feb 2012 09:01:56 +0700 Edho Arief Updated version and copyright.
Thu, 09 Feb 2012 08:59:30 +0700 Edho Arief Awesomely incorrect logic.
Thu, 09 Feb 2012 08:47:47 +0700 Edho Arief [moefetch] User agent, referer.
Thu, 09 Feb 2012 08:30:09 +0700 Edho Arief Why .sh.
Thu, 09 Feb 2012 08:29:49 +0700 Edho Arief Merge.
Sun, 15 Jan 2012 08:42:56 +0700 Edho Arief Ensure we have less.
Thu, 16 Feb 2012 17:47:44 +0700 Edho Arief more rules~
Thu, 16 Feb 2012 17:47:28 +0700 Edho Arief New fingerprints for bitbucket.
Thu, 09 Feb 2012 00:12:13 +0700 Edho Arief More!
Wed, 08 Feb 2012 22:12:07 +0700 Edho Arief Even more rules.
Wed, 08 Feb 2012 21:33:03 +0700 Edho Arief More rules!
Thu, 12 Jan 2012 15:03:20 +0700 Edho Arief Merge.
Thu, 12 Jan 2012 10:43:27 +0300 Edho Arief Fixes.
Wed, 04 Jan 2012 11:49:34 +0700 Edho Arief Faster rdesktop.
Thu, 12 Jan 2012 15:02:53 +0700 Edho Arief More ren rules.
Thu, 22 Dec 2011 15:05:09 +0700 Edho Arief Autocomplete with ^D in readline.
Thu, 22 Dec 2011 15:00:25 +0700 Edho Arief Merge.
Thu, 22 Dec 2011 15:00:08 +0700 Edho Arief More rules.
Sun, 25 Dec 2011 00:50:31 +0700 Edho Arief Not just append but also read.
Sat, 24 Dec 2011 23:44:52 +0700 Edho Arief Merge
Wed, 21 Dec 2011 22:07:00 +0700 Edho Arief Alias for newer hg. Also more search path.
Sat, 24 Dec 2011 23:44:11 +0700 Edho Arief Ensure less does actually exist. Default to more.
Thu, 08 Dec 2011 19:12:53 +0700 Edho Arief Merge.
Thu, 08 Dec 2011 16:27:53 +0700 Edho Arief Multi CPU Top on FreeBSD.
Thu, 08 Dec 2011 15:22:00 +0700 Edho Arief Something.
Thu, 08 Dec 2011 15:21:45 +0700 Edho Arief ' -> "
Thu, 08 Dec 2011 15:20:57 +0700 Edho Arief alias man for FreeBSD.
Tue, 06 Dec 2011 23:56:23 -0500 Edho Arief StartSSL appender for nginx.
Sat, 03 Dec 2011 00:47:24 +0700 Edho Arief Supervisor support. Added on last since I usually install it in virtualenv
Thu, 08 Dec 2011 19:11:57 +0700 Edho Arief Check GNU ls on Solaris.
Thu, 24 Nov 2011 15:23:18 +0700 Edho Arief As it turns out who am i doesn't respect current actual user. Replaced with ancient but better version. Either LOGNAME or USER. Whichever has value.
Thu, 24 Nov 2011 15:21:33 +0700 Edho Arief Grep, GNU Grep, Solaris Grep, etc.
Thu, 24 Nov 2011 15:10:24 +0700 Edho Arief As it turns out, Solaris' grep isn't POSIX.
Thu, 24 Nov 2011 13:52:07 +0700 Edho Arief Merge. Also more workaround for Solaris tmux.
Thu, 24 Nov 2011 13:03:45 +0700 Edho Arief Always export LSCOLORS and CLICOLOR
Thu, 24 Nov 2011 13:02:04 +0700 Edho Arief rm -I saner test.
Thu, 24 Nov 2011 13:28:13 +0700 Edho Arief tmux terminal for Solaris.
Thu, 24 Nov 2011 12:24:05 +0700 Edho Arief Paths for MySQL, instabreak for mercurial.
Thu, 24 Nov 2011 12:16:27 +0700 Edho Arief New color for tmux.
Thu, 24 Nov 2011 11:27:10 +0700 Edho Arief Always use dtterm for Solaris if no relevant TERM found (usually missing screen or xterm-256color).
Thu, 24 Nov 2011 11:12:04 +0700 Edho Arief Path rearrange.
Thu, 24 Nov 2011 11:07:25 +0700 Edho Arief Solaris' id doesn't have `id -un`, use `who am i | cut -d ' ' -f 1` instead.
Thu, 24 Nov 2011 09:42:16 +0700 Edho Arief Even more rules.
Sun, 20 Nov 2011 23:21:45 +0700 Edho Arief Merge.
Wed, 16 Nov 2011 22:31:35 +0000 Edho Arief Always correct username, static hostname.
Tue, 15 Nov 2011 12:10:28 +0700 Edho Arief Color tester.
Tue, 15 Nov 2011 12:10:09 +0700 Edho Arief PATH adjustment for OpenBSD.
Mon, 14 Nov 2011 11:08:45 +0300 Edho Arief Combined PS1 and PROMPT_COMMAND conditional.
Mon, 14 Nov 2011 11:06:47 +0300 Edho Arief (Not so) simplified solaris path add.
Mon, 14 Nov 2011 11:02:47 +0300 Edho Arief Awesome custom paths by default.
Sun, 20 Nov 2011 23:21:19 +0700 Edho Arief Proper test for for loop (*, .*)
Tue, 08 Nov 2011 22:31:10 +0700 Edho Arief Automated bash color prompt.
Wed, 09 Nov 2011 10:36:15 +0000 Edho Arief Some support for netbsd.
Tue, 08 Nov 2011 11:59:49 +0700 Edho Arief Awesome merge.
Mon, 07 Nov 2011 12:36:38 +0700 Edho Arief Path adjustment for Solaris. Mainly for coping with Solaris 10.
Mon, 07 Nov 2011 12:34:33 +0700 Edho Arief Much more portable. Tested on Solaris (bourne shell yay).
Mon, 07 Nov 2011 12:30:06 +0700 Edho Arief Ensures we're running tcsh.
Mon, 07 Nov 2011 12:26:10 +0700 Edho Arief Turns out solaris doesn't have [
Thu, 03 Nov 2011 15:55:44 +0700 Edho Arief [tcsh] Sanity tester.
Thu, 03 Nov 2011 15:43:17 +0700 Edho Arief [bash] Also ensures interactive terminal.
Thu, 03 Nov 2011 15:41:03 +0700 Edho Arief [tcsh] Ensures interactive terminal.
Sun, 02 Oct 2011 07:24:37 +0700 Edho Arief Merge.