Merge remote-tracking branch 'upstream/master' into develop

Conflicts: deploy/macports
entheologist · Aug 2, 2012 · 5ffe39a · 5ffe39a
2 parents 9c8cc92 + d7192ea
commit 5ffe39a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deploy/macports b/deploy/macports
@@ -7,7 +7,7 @@
 #    Ben O'Hara <[email protected]>
 #
 
-coreutils +with_default_names
+coreutils
 screen
 elinks +col256
 mutt-devel +sasl +ssl +smtp +sidebar +headercache +tokyocabinet +gpgme

diff --git a/dotsync b/dotsync