From: yomguy <yomguy@parisson.com>
Date: Mon, 8 Oct 2012 16:05:47 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9a3fc67b6ae20ece46f1476265d81e8365190818;p=telemeta.git

Merge branch 'master' into crem

Conflicts:
	tools/dev/push.sh
---

9a3fc67b6ae20ece46f1476265d81e8365190818
diff --cc tools/dev/push.sh
index 3b99d10b,bc221452..6a3288a5
--- a/tools/dev/push.sh
+++ b/tools/dev/push.sh
@@@ -4,13 -4,11 +4,8 @@@ git branch | tr -d \* | while read lin
  do
      branch=${line/#\ }
  
 -    echo "Push $branch to origin:"
      git push origin $branch
 -
 -    echo "Push $branch to github:"
      git push hub $branch
-  
- #    if [[ $branch == *master* ]]; then
- #        echo "Push $branch to github:"
- #        git push hub $branch
- #    fi
  
  done