From 04a5a735f89e15d2197b43c606548ed095d0bf7d Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 23 Nov 2014 03:29:17 -0800
Subject: [PATCH] parse_timestamp and emacs.d bump.

---
 dotfiles/emacs.d                   | 2 +-
 dotfiles/lib/shellenv/functions.sh | 8 ++++++++
 dotfiles/lib/shellrc/aliases.sh    | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index d02cbaa2..e2f36cba 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit d02cbaa2dcc57df8069174cdae35b4372f50556f
+Subproject commit e2f36cbab5e9889e08c9b123e2104b8522969f76
diff --git a/dotfiles/lib/shellenv/functions.sh b/dotfiles/lib/shellenv/functions.sh
index f815e55e..90558579 100644
--- a/dotfiles/lib/shellenv/functions.sh
+++ b/dotfiles/lib/shellenv/functions.sh
@@ -276,3 +276,11 @@ function mu4e_directory {
 	echo "$(brew --prefix mu)/share/emacs/site-lisp/mu4e"
     fi
 }
+
+function timestamp {
+    date +%s
+}
+
+function parse_timestamp {
+    date -d "@$1"
+}
diff --git a/dotfiles/lib/shellrc/aliases.sh b/dotfiles/lib/shellrc/aliases.sh
index c040ccef..6363e490 100644
--- a/dotfiles/lib/shellrc/aliases.sh
+++ b/dotfiles/lib/shellrc/aliases.sh
@@ -1,7 +1,6 @@
 alias tmux="tmux -2"
 alias reload_tmux_conf="tmux source-file ~/.tmux.conf"
 alias tmux_cb_to_remote_cb='tmux saveb - | linux_nc_paste_to_remote_clipboard'
-alias timestamp='date +%s'
 alias fn='find . -name '
 alias prj='cd ~/Projects'
 alias t27='tox -e py27 -- '