# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1382419103 -10800
# Node ID 0b04ee3558d86131ab76c5fc92308ecd3d36cbf9
# Parent  e5be6d749d0652febcdd8112eb9f93c0fa92fd5e# Parent  a1af1d3582b6f73a1505958cbb5a8da641396234
merged

diff -r a1af1d3582b6 -r 0b04ee3558d8 .emacs-my
--- a/.emacs-my	Mon Oct 21 13:55:10 2013 +0300
+++ b/.emacs-my	Tue Oct 22 08:18:23 2013 +0300
@@ -202,7 +202,8 @@
 (message "package, elpa")
 
 ;; (setq package-enable-at-startup t)
-(package-initialize)
+(when (fboundp 'package-initialize)
+  (package-initialize))
 
 (setq package-archives
       '(