Merge changes from upstream.

Squashed commit of the following:

commit 0aeefb48c0ac885a516fb92f7f5bfd7e85ce7a37
Merge: 81b7b3c a6dd83c
Author: Phil Haack <haacked@gmail.com>
Date:   Thu Jan 24 12:40:18 2013 -0800

    Merge pull request #523 from shanselman/patch-1

    Updated to exclude *.publishsettings

commit a6dd83c18d0beb8e36c091fd33b64ca45a3a0f3a
Author: Scott Hanselman <scott@hanselman.com>
Date:   Thu Jan 24 12:24:17 2013 -0800

    Updated to exclude *.publishsettings

    Updated to exclude *.publishsettings

commit 81b7b3c64a92c4f16fb729c31f1516d373b32658
Merge: eaa2ad5 9d8b60e
Author: Alan Rogers <alan@github.com>
Date:   Tue Jan 22 13:42:45 2013 -0800

    Merge pull request #507 from 0xAX/master

    Erlang.gitignore erlang.crash.dump added

commit eaa2ad526f00f6ab743a3a6332126bdfeb59d86f
Merge: 5f8b946 3c54c0d
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Tue Jan 22 13:39:30 2013 -0800

    Merge pull request #474 from zhaojunmeng/master

    Add *~ to ignore vim temp file.

commit 5f8b94622e2b318365fa260839644e11badaf688
Merge: bdafdbd e54e1b7
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Tue Jan 22 13:37:59 2013 -0800

    Merge pull request #508 from alloy/master

    [Objective-C] No longer ignore `xcworkspace` documents.

commit bdafdbdc38790ed660f3fdf7c803ed986677f4df
Merge: 0e38a13 cb8a50a
Author: Phil Haack <haacked@gmail.com>
Date:   Tue Jan 22 13:25:08 2013 -0800

    Merge pull request #519 from Haacked/visualstudio-teamcity

    VisualStudio: Add TeamCity exclusion

commit cb8a50ae284b84439ca2885ab2faf03b17097ee9
Author: Snakiej <kristof@kristofmattei.be>
Date:   Fri Oct 19 15:32:36 2012 +0300

    VisualStudio: Add TeamCity exclusion

    Exclude folders created by the TeamCity VS plugin.

commit 0e38a13ffb748ea96cc0209860b3c3212df28938
Merge: 9bd710e c6bcfb1
Author: Matt Burke <spraints@gmail.com>
Date:   Tue Jan 22 12:08:37 2013 -0800

    Merge pull request #514 from bristol/vim-swapfile-fix

    Changed line matching vim swapfiles to use all names it will create

commit 9bd710e4b32ccf37e3c2532a1fdf2d1e1a5eebe2
Merge: af26e76 8f47a43
Author: Phil Haack <haacked@gmail.com>
Date:   Tue Jan 22 12:01:26 2013 -0800

    Merge pull request #518 from Haacked/more-pr-consolidation

    More pr consolidation

commit af26e76cc250578cc46a7b92da1a6de9a8c73af3
Merge: b255d43 77ef092
Author: Phil Haack <haacked@gmail.com>
Date:   Tue Jan 22 12:00:24 2013 -0800

    Merge pull request #517 from steveoh/patch-1

    Update VisualStudio.gitignore for vs 2012 web deploy setting.

commit 8f47a43cee3ca215361f797583b663eb61143b1a
Author: Matt Cooper <vtbassmatt@gmail.com>
Date:   Mon Sep 10 06:49:43 2012 -0700

    Update Global/VisualStudio.gitignore

    Visual Studio 2010 Express for Windows Phone seems to generate .cachefile files.

commit cf4bb0cf464b1fb7b2dee93ec8f2f5d2aa88193c
Author: Haacked <haacked@gmail.com>
Date:   Tue Jan 22 11:51:46 2013 -0800

    Remove inclusion of repositories.config

    If you use package restore, you actually don't want this file
    included. It's not needed. It's only needed if you version
    packages. AKA, you only need this file if you are not ignoring
    the "packages" folder.

commit b255d43e80ba8eec8709a3da0b679774600c3051
Merge: 33fe1d3 5684f73
Author: Phil Haack <haacked@gmail.com>
Date:   Tue Jan 22 11:40:59 2013 -0800

    Merge pull request #516 from Haacked/dotnet-gitignore-pr-consolidation

    Dotnet gitignore pr consolidation

commit 5684f73b9844eba53642c41b3e742e4d13960e24
Author: Paul Stack <public@paulstack.co.uk>
Date:   Thu Apr 19 11:17:30 2012 +0200

    VisualStudio: ignore .dotcover files.

commit 5f950e0aeccbdb3450114587047c653bf53150bd
Author: Kristian Hellang <khellang@hotmail.com>
Date:   Wed Aug 15 10:54:17 2012 +0300

    VisualStudio: Include the packages/repositories.config file.

    I agree to ignore the NuGet packages folder, but I really think you should check in the repositories.config so NuGet PackageRestore can do it's magic when someone pulls the code and tries to build it...

commit 78b77feb29cb0e8e5b3e984743f6f4855961006b
Author: Andrew Arnott <andrewarnott@gmail.com>
Date:   Sat Aug 11 15:33:32 2012 -0700

    VisualStudio: Ignore vi's *~ temp files

commit ed056fdb8e8dc799cbc03f6a5f90b0bdbf20d416
Author: neogic <github@neogic.com>
Date:   Tue Dec 11 02:28:04 2012 +0000

    VisualStudio: Remove dupes, add trailing slashes, etc.

    Add trailing slashes to folders, RS rule comment, remove dupes.

commit 2ed26ea654df110f66d9d2740e67287054712c5f
Author: sgm <sim0629@gmail.com>
Date:   Wed Jan 9 21:35:20 2013 +0900

    VisualStudio: Ignore *.tmp_proj

    This might be created temporarily during a build.

commit e12c304ebd9d72d3bf168d56cf6de813b934f13c
Author: Bernhard Döbler <programmer@bardware.de>
Date:   Sat Jan 19 17:25:10 2013 +0100

    VisualStudio: Ignore update log HTML file

    VS2012 creates UpdateLog2.htm - not needed in git repository

commit 77ef0922f2ec4fca7bda3cd7630455e8b9c1bb1e
Author: steve <icsteveoh@gmail.com>
Date:   Tue Jan 22 12:33:24 2013 -0700

    Update VisualStudio.gitignore

    New web deploy file name? vs 2012 added this to my solution and it shouldn't go to an open repo.

commit 33fe1d376d17bc60b70599c1a3aab97c2d36f210
Merge: cec9f74 f5d6719
Author: Phil Haack <haacked@gmail.com>
Date:   Tue Jan 22 10:36:18 2013 -0800

    Merge pull request #492 from Haacked/consolidate-dotnet-settings

    Consolidate CSharp and VB.NET gitignore files into VisualStudio one.

commit f5d67199f7c58f9f10af46b05869eb973661deae
Author: Phil Haack <haacked@gmail.com>
Date:   Tue Jan 22 10:35:42 2013 -0800

    Ignore crap from Macs

    Cross platform .NET Dev FTW!

commit 79a7a1d9c5c1c389a6eb1de2411c1c2c1ba755d2
Author: Phil Haack <haacked@gmail.com>
Date:   Tue Jan 22 10:30:18 2013 -0800

    Ignore .pfx files such as Windows Store Key

commit c6bcfb1bd4342446879aacba8e8d04972c1a2f87
Author: andy bristol <andbristol@gmail.com>
Date:   Mon Jan 21 20:10:16 2013 -0500

    Changed line matching vim swapfiles to use all names it will create as described in http://vimdoc.sourceforge.net/htmldoc/recover.html#E326

commit cec9f74523332963fb40703e4da3a206254447c0
Merge: b1dbb55 6c95cdd
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Sun Jan 20 21:15:08 2013 -0800

    Merge pull request #329 from svkampen/patch-1

    Added __pycache__

commit b1dbb55368ff2d27194359456868a67556e6ce44
Merge: f31b319 ef9e85b
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Sun Jan 20 19:12:08 2013 -0800

    Merge pull request #445 from bungeshea/WordPress

    Rename Wordpress.gitignore to WordPress.gitignore

commit ef9e85b4780de3d69911076fe57449093e9186a7
Author: Shea Bunge <bungeshea@users.sourceforge.net>
Date:   Sat Jan 19 17:03:36 2013 +1100

    Renamed Wordpress.gitignore to WordPress.gitignore
    WordPress should *always* have a capital P!

commit ac43133993d8d39bbe3a7cfa8db1942993bcb763
Author: Shea Bunge <bungeshea@users.sourceforge.net>
Date:   Sat Jan 19 17:03:03 2013 +1100

    Removed Wordpress.gitignore for renaming

commit e54e1b752be884da98f05ab970ae26c9775f8b35
Author: Eloy Durán <eloy.de.enige@gmail.com>
Date:   Tue Jan 15 11:33:57 2013 +0100

    [Objective-C] No longer ignore `xcworkspace` documents.

    Workspaces are real documents that can be opened, just like `xcodeproj`
    documents. These documents are also generated/used by CocoaPods to
    configure a project’s dependencies. For these reasons, there does not
    seem a good reason to ignore these any longer.

commit 9d8b60e91d53f81ee0e924413a1419557bf0cb4e
Author: 0xAX <0xAX@gmail.com>
Date:   Mon Jan 14 15:01:00 2013 +0600

    Erlang.gitignore erlang.crash.dump added

commit 6c95cdd9b9ba695185b6cd8af767ff12338b31ec
Author: Sam van Kampen <samint64@gmail.com>
Date:   Sun Jan 13 17:41:18 2013 +0100

    Removed comment.

commit f06c0504ac984ee44ddc820c609a4e9490ec7d19
Author: Haacked <haacked@gmail.com>
Date:   Wed Dec 19 15:49:20 2012 -0800

    Remove CSharp and VB.NET ignore files

    These files were redundant. They had almost exactly the same
    settings. They are being replaced by the VisualStudio file.

commit 947f5d13abd1e35a2ce103e7add12417f4f27b53
Author: Haacked <haacked@gmail.com>
Date:   Wed Dec 19 15:46:33 2012 -0800

    Merge missing CSharp/VB settinsg into VisualStudio

    The VisualStudio gitignore file was missing a few useful
    settings contained in the CSharp and VB.NET gitignore files.

commit ec5009e954d78b23dfa52e80e26c8dd25822b9e4
Author: Haacked <haacked@gmail.com>
Date:   Wed Dec 19 15:28:41 2012 -0800

    Move VisualStudio file from Global to main list

commit f31b319dca10213163411cb710c27dc37ed3eac5
Merge: 13a24fb aec3539
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:58:58 2012 -0800

    Merge pull request #301 from jshou/patch-1

    * patch-1:
      add intellij files to Android.gitignore

commit aec35399986a290636040a0875771dbccbe08d26
Author: Joshua Hou <joshuahou@gmail.com>
Date:   Wed Apr 18 18:42:13 2012 -0700

    add intellij files to Android.gitignore

commit 13a24fbe6bcb13375ee7bc43b089335867c06701
Merge: 2944626 fa5763a
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:51:49 2012 -0800

    Merge pull request #456 from jan0sch/master

    Added gitignore file for Typo3.

commit 2944626570afd4f19fb06f7a56c315e462048d60
Merge: c0b0c1b 9a2661f
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:50:24 2012 -0800

    Merge pull request #318 from macagua/master

    Added gitignore for Plone CMS

commit c0b0c1ba3a1e99fcb71de7bbc9597872df159568
Merge: 016ba1e 74310b6
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:37:59 2012 -0800

    Merge pull request #481 from larsw/patch-1

    Added section for SQL Server files

commit 016ba1ea1bf5a4e5da0b846ccb4c68e35ef9812c
Merge: 4f86c33 044043f
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:37:14 2012 -0800

    Merge pull request #482 from amalrik/change_global_osx_to_unix_line_endings

    change the line endings of Global/OSX from dos to unix format

commit 4f86c33896acea191ea121b61c72612d583e5b1e
Merge: 10bf0c2 a698a92
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:35:58 2012 -0800

    Merge pull request #463 from michaelminter/patch-1

    add .project files to .gitignore

commit 10bf0c228b2465476f41882295199f5e9bafced2
Merge: d275f65 62ca795
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:32:10 2012 -0800

    Merge pull request #479 from mfloryan/cSharpAdditions

    C# additions

commit d275f65aa14990aa85954992e3b3c183a0896008
Merge: c00b49a d3dba5b
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:30:39 2012 -0800

    Merge pull request #454 from adrie-dh/patch-1

    Concrete5: Also ignore /tmp files

commit c00b49a0694e1c7f564abac5a94971e8979b752f
Merge: c661dd8 4db1b04
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:24:33 2012 -0800

    Merge pull request #404 from jschmid/patch-1

    Android: Ignore the proguard folder

commit c661dd8838ca03d9dacbb10f3743ce6220405c74
Merge: 7a016f4 0b64d5e
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:16:46 2012 -0800

    Merge pull request #413 from mibe/eagle

    Eagle

commit 7a016f440314830464b4e6afdb610f1491424568
Merge: 46af6d0 74e12d9
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:12:59 2012 -0800

    Merge pull request #423 from pingwinator/master

    add *.hmap

commit 46af6d0227663463417efed5aa0804dbb11c995b
Merge: 56d6796 b184145
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:06:40 2012 -0800

    Merge pull request #475 from duncandee/patch-1

    Update Wordpress.gitignore

commit 56d67963539679418949b264af9c454a13d76617
Merge: 8e26753 3df67a9
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 14:02:17 2012 -0800

    Merge pull request #470 from pronebird/master

    node_modules

commit 8e26753319d96206ac14e3680a1132c520e489e9
Merge: a68c74f 694eb80
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 13:58:55 2012 -0800

    Merge pull request #461 from johnmccutchan/master

    Add Dart language support

commit a68c74feb7b151981c45c1c9e28cb282140a34b4
Merge: 5ebb180 c9397c5
Author: Daniel Hengeveld <danielwh@gmail.com>
Date:   Wed Dec 19 13:56:03 2012 -0800

    Merge pull request #462 from mwitek/update-rails

    added .rvmrc to the list of ignored extentions

commit fa5763a70a530df55974828098cce5c3d46deafb
Merge: 0fc164e 5ebb180
Author: Jens Jahnke <jan0sch@gmx.net>
Date:   Wed Dec 19 14:02:28 2012 +0100

    Merge remote-tracking branch 'upstream/master'

commit 5ebb180e6de965aca86afcb6f1015f6a4f8edcd5
Merge: 747efed 3ce543b
Author: Rob Sanheim <rsanheim@gmail.com>
Date:   Wed Dec 19 00:37:33 2012 -0800

    Merge pull request #490 from Haacked/add-mit-license

    Adding an MIT license

commit 3ce543bc4d181b62906112f1d84b5531e81e87e7
Author: Phil Haack <haacked@gmail.com>
Date:   Mon Dec 17 11:21:18 2012 -0800

    Adding an MIT license

    Want to make it clear that anybody can use these files
    in any way they need to.

commit 044043f5590e8018d0f51e668bfd7fbac30b57f6
Author: amalrik <amalrik.maia@gmail.com>
Date:   Thu Nov 22 21:33:12 2012 -0200

    change the line endings of Global/OSX from dos to unix format

commit 74310b68b14aceaba10336a70f7fedc3b3728774
Author: Lars Wilhelmsen <lars@sral.org>
Date:   Thu Nov 22 13:30:04 2012 +0100

    Added section for SQL Server files

    Ignore SQL Server Database and log files in App_Data.

commit 62ca79528e33b187fed975ebd876f63d070a2a45
Author: Marcin Floryan <marcin.floryan@gmail.com>
Date:   Tue Nov 20 11:06:33 2012 +0000

    Ignore SASS cache

    Adds ignore for a sass cache used by Mindscape Web Workbench (generatings css
    from .scss files).

commit b33818a4288ad18247dc777f3b155ec51fe23853
Author: Marcin Floryan <marcin.floryan@gmail.com>
Date:   Tue Nov 20 11:02:21 2012 +0000

    Removed duplication of bin on obj folders

    These two lines look like a duplicate of what we already have at the top of the
    file and if we want to keep it should probably go under # Build results

commit b184145693fcc07d0f40cc47ce3a62c6b5879918
Author: duncandee <duncandee@gmail.com>
Date:   Fri Nov 16 09:06:57 2012 +0200

    Update Wordpress.gitignore

    Duplicate sitemap.xml

commit 3c54c0d7aa915ab2c39c03ed70cefcce4d6054e4
Author: zhaojunmeng <zhaojun.meng@gmail.com>
Date:   Wed Nov 14 22:24:17 2012 +0800

    Add *~ to ignore vim temp file.

commit 3df67a965101828dc87f6c0248030d7efe5d6252
Author: Andrej Mihajlov <and.mikhaylov@gmail.com>
Date:   Thu Nov 8 14:07:25 2012 +0100

    Update Node.gitignore

commit a698a92747b9f0fe332b2136e17664cea3a2d634
Author: Michael Minter <mothore@gmail.com>
Date:   Tue Oct 30 12:05:22 2012 -0500

    add .project files to .gitignore

    .project files come from Aptana Studio, a Rails IDE.

commit c9397c586be3e252fd2a479b6e7b037c150aaff1
Author: mwitek <matt@mwitekdesign.com>
Date:   Sun Oct 28 20:49:30 2012 -0400

    added .rvmrc to the list of ignored extentions

commit 694eb80d7bcbf1d42d09151d71c62c69c3dcfa2e
Author: John McCutchan <john@johnmccutchan.com>
Date:   Fri Oct 26 17:58:35 2012 -0700

    Add Dart language support

commit 0fc164e94ee77c8e8b3ffe78e614bf7ce7699eb7
Author: Jens Jahnke <jan0sch@gmx.net>
Date:   Wed Oct 17 12:05:58 2012 +0200

    Added gitignore file for Typo3.

    To make it easier to handle typo3 under git.
    There is a related entry at stackoverflow:
    http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git

commit d3dba5beb988b73ba7fee299131cc7f0a9c3c6a3
Author: Adrie den Hartog <github@osirisdesigns.nl>
Date:   Tue Oct 16 16:21:31 2012 +0300

    Concrete5: Also ignore /tmp files

    Concrete5: Also ignore /tmp files

commit 747efedec0a85efb8234710f05629ca5382e3914
Merge: 8200f76 cdb12b3
Author: Coby Chapple <coby@github.com>
Date:   Fri Oct 12 00:08:07 2012 -0700

    Merge pull request #450 from rbxbx/patch-1

    Update Leiningen.gitignore

commit cdb12b37545c566f41787e067d11680458dad02c
Author: Robert Pitts <rbxbxdev@gmail.com>
Date:   Thu Oct 11 16:59:14 2012 -0700

    Update Leiningen.gitignore

    /targets/ should be ignored as well

commit 8200f7697346f89ee1a43f4aa567ebb788a02f44
Merge: 2b46b24 21f9741
Author: Jared Koumentis <jared@github.com>
Date:   Fri Oct 5 15:15:59 2012 -0700

    Merge pull request #341 from x3ro/fix-sublime

    The sublime-project file should be checked into version control

commit 2b46b24413fee2dca435ae6fd1a2896a565a4c4b
Merge: 802cb3f 9865ef3
Author: Jared Koumentis <jared@github.com>
Date:   Fri Oct 5 15:14:44 2012 -0700

    Merge pull request #382 from x3ro/latex-addition

    Ignore *.tdo files generated by the todonotes package

commit 802cb3f13c947381d78f03478913f6fac5652c1d
Merge: d17f128 818ed29
Author: Jared Koumentis <jared@github.com>
Date:   Fri Oct 5 15:13:44 2012 -0700

    Merge pull request #380 from borekb/patch-1

    Flex / ActionScript project files removed from .gitignore

commit d17f1285852eb05ddafc94ec6fae2ebe851ec09c
Merge: aa8fd18 187c9cd
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:53:55 2012 -0700

    Merge pull request #440 from nap/master

    PyCharm IDE project specific files

commit aa8fd18ed37bc64d8c214f57bb516065384ed875
Merge: e605ce7 7ce12c7
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:50:59 2012 -0700

    Merge pull request #215 from nkh/patch-1

    Do not ignore directory matching /Build/

commit e605ce745a224050de763e1139244795362fa99e
Merge: e571ee1 8a47a81
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:44:49 2012 -0700

    Merge pull request #212 from ikeike443/patch-1

    Delete duplicated "eclipse" and support ignoring IDEA's metafile such as

commit e571ee1e42914227c946e5315484ad02dfb55345
Merge: e0fbe0f d49148e
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:41:13 2012 -0700

    Merge pull request #349 from tucnak/master

    Gitignore for Qt core developers

commit e0fbe0f0b3ffe3c16b286543afddf7efc6090905
Merge: 62ca2a7 f4530cf
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:38:36 2012 -0700

    Merge pull request #354 from misham/sdcc

    Adding support for SDCC compiler files

commit 62ca2a71d771197d5ce0a70ca721fd7b202e353b
Merge: 2671086 a3e7652
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:36:47 2012 -0700

    Merge pull request #321 from torifat/patch-1

    duplicate entry for modules removed

commit 2671086d638aa2c51feb71100901c43d02be82aa
Author: Jared Koumentis (ShepBook) <jared@github.com>
Date:   Thu Oct 4 20:30:20 2012 -0400

    attempting to merge https://github.com/github/gitignore/pull/310

commit a235be60b243af6cd7fcdd74f257f43bc2a4615c
Merge: 3dbe9c9 0537b8d
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:20:07 2012 -0700

    Merge pull request #314 from squallstar/master

    Bancha CMS .gitignore

commit 3dbe9c96d1eeed49b9fca744a25ae2d0945c4762
Merge: c1cac76 0bcb4f2
Author: Jared Koumentis <jared@github.com>
Date:   Thu Oct 4 17:16:25 2012 -0700

    Merge pull request #441 from StanislawSwierc/master

    Added Windows Store app package directory

commit 0bcb4f258c0696e7ac2246c16200b8e7fbc9015b
Author: Stanislaw Swierc <stanislaw.swierc@gmail.com>
Date:   Mon Oct 1 10:05:17 2012 +0100

    Added Windows Store app package directory

commit 187c9cd39900d78b01e7aad782ae71044818930d
Author: Jean-Bernard Ratté <jean.bernard.ratte@unary.ca>
Date:   Sun Sep 30 11:51:29 2012 -0400

    VritualEnv specific files generated automaticaly when a new Env is created

commit e295e20fa2a31d0826a24d1009428788fc330b4a
Author: Jean-Bernard Ratté <jean.bernard.ratte@unary.ca>
Date:   Sun Sep 30 11:47:35 2012 -0400

    PyCharm IDE project specific files

commit c1cac76c736201f5180484eebdcc9c7eb3a6c71b
Author: Ted Nyman <ted@ted.io>
Date:   Sun Sep 23 14:31:30 2012 -0700

    Update README to detail best pull request style

commit 64cc236103b2fdca5d73ab51cc6515937ac4053b
Merge: 9a95caf a5d6516
Author: Ted Nyman <ted@ted.io>
Date:   Mon Sep 10 15:00:48 2012 -0700

    Merge pull request #425 from nateabele/patch-1

    The Lithium app should be the root repo folder

commit 9a95caff33adedd3a698fc2e9e81331d271a1aa9
Merge: c61686f cae4051
Author: Ted Nyman <ted@ted.io>
Date:   Mon Sep 10 14:55:29 2012 -0700

    Merge pull request #363 from Baztoune/master

    Added Play 2.0 working directories

commit a5d6516f13097dc93cab4116bcc95ab7f03eca26
Author: Nate Abele <nate.abele@gmail.com>
Date:   Sat Sep 1 19:10:36 2012 -0300

    The Lithium app should be the root repo folder

commit c61686f9888e088bf6fad726100138b0270126ba
Merge: f1cb24b 964de38
Author: Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Date:   Mon Aug 27 09:21:15 2012 -0700

    Merge remote-tracking branch 'exalted/master'

commit 74e12d9cb7cb1045f3ea4916a3cc1c4f98f7c33f
Author: Vasyl Liutikov <vasya.lutikov@postindustria.com>
Date:   Mon Aug 27 14:01:57 2012 +0300

    ignore all build directories in subdirectories

commit 392a91e792dbfcbf87fafa0dd0bc4c641771d12f
Author: Vasyl Liutikov <vasya.lutikov@postindustria.com>
Date:   Mon Aug 27 14:00:59 2012 +0300

    add *.hmap

commit 964de38e9b75e3c716496180001e1765ca3ecd9d
Merge: 54928f5 f1cb24b
Author: Ali Servet Donmez <asd@pittle.org>
Date:   Mon Aug 27 12:40:37 2012 +0200

    Merge branch 'master' of https://github.com/github/gitignore

    Conflicts:
    	Global/OSX.gitignore

commit 54928f53d7d058f3b96a5a812e49184f2e9ee48b
Author: Ali Servet Donmez <asd@pittle.org>
Date:   Mon Aug 27 12:38:11 2012 +0200

    Seems like this should go into OSX.gitignore instead.

commit f1cb24b9c2cc212f241256955ff12081896e7a66
Merge: f78c09f 6670a4c
Author: Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Date:   Mon Aug 27 03:29:25 2012 -0700

    Merge remote-tracking branch 'stig/patch-1'

    Conflicts:
    	Objective-C.gitignore

commit f78c09ffd22421ba6de22975140934a07e2d9a48
Author: Coby Chapple <coby@github.com>
Date:   Fri Aug 24 16:43:07 2012 +1000

    Manual merge to close #305

commit 4f958411c18c9131bd93bb2016bb3f3d3d71e6d6
Merge: 75da0e1 dfb30c6
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 23 23:39:41 2012 -0700

    Merge pull request #303 from safwanc/matlab-mex

    Ignoring compiled MEX binaries for all platforms

commit 75da0e1af2c3762daca6e67d3aa66b96d86b71ce
Merge: 25a1e61 174c45e
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 23 23:38:56 2012 -0700

    Merge pull request #419 from jonhkr/patch-1

    Added .AppleDouble to OSX

commit 25a1e617c4b0dfeedcd2907cb9ad7746cc837b91
Merge: c160ad9 a1ef233
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 23 23:36:53 2012 -0700

    Merge pull request #420 from vanniksoftware/master

    Appcelerator Titanium .gitignore file

commit a1ef23350d062b9da07e7d9e5f0652b9e1e55ea2
Author: Mike Nikles <mike@vanniksoftware.com>
Date:   Wed Aug 22 18:06:15 2012 -0700

    Added Appcelerator Titanium .gitignore file.

commit 174c45e796b57d79ac1b8a400559d6b7a272a4a5
Author: Jonas Trevisan <jonhkr@gmail.com>
Date:   Wed Aug 22 13:38:50 2012 -0300

    Added .AppleDouble to OSX

commit d08fbbd0d4739cde05a2dd7e8e8afa138586f785
Merge: 6f6c2ea c160ad9
Author: Ali Servet Donmez <asd@pittle.org>
Date:   Wed Aug 22 12:22:38 2012 +0200

    Merge branch 'master' of https://github.com/github/gitignore

commit c160ad912ac53cfce0d3f8e7a5639afe4879247f
Merge: 76dd79a 2f7bc6b
Author: Coby Chapple <coby@github.com>
Date:   Sun Aug 19 17:13:52 2012 -0700

    Merge pull request #415 from honzajavorek/patch-1

    Added missing whitespaces in comments

commit 2f7bc6bab32f82fd01a623b35f5135345a4735c0
Author: Honza Javorek <jan.javorek@gmail.com>
Date:   Sat Aug 18 19:55:23 2012 +0300

    added missing whitespaces in comments

commit 0b64d5e93d28922f27e10f8ea864de2c334e43ac
Author: Michael Bemmerl <mail@mx-server.de>
Date:   Wed Aug 15 01:43:20 2012 +0200

    .gitignore file for Eagle

commit 76dd79a51f7d37fa3e0c60b2f48fdab85a6a2e95
Merge: d14aab9 2661a82
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 9 20:45:01 2012 -0700

    Merge pull request #406 from ecarreras/master

    Adding PyDev files to .gitignore

commit d14aab9a64ad6ff2a1492e3c9ec8d5398c563229
Merge: e732aa4 de7a711
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 9 20:43:59 2012 -0700

    Merge pull request #407 from AArnott/patch-1

    Adds .vspx and .log files to exclude for C#/VB

commit e732aa40a1a7b1036112335e75ad6e72f2b06775
Merge: fa954f2 4eebde9
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Thu Aug 9 00:10:14 2012 -0700

    Merge pull request #348 from bjoern-esser/master

    ignore bz2 files, which are bzip2 actually

commit fa954f291ef332338f53e1947b7a11f8e07ee470
Merge: f453a04 720975f
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Thu Aug 9 00:09:51 2012 -0700

    Merge pull request #334 from mkenyon/master

    Add OSX-specific Icon\r rule

commit f453a04cb437dcd41dfca7a4e4b330db7261d089
Merge: b281865 e1c4a48
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Thu Aug 9 00:03:25 2012 -0700

    Merge pull request #294 from yrashk/patch-1

    Don't ignore priv directory in Erlang projects

commit b2818653f65f5db9836cc1a286fe48845c347818
Merge: 5a86094 c27430e
Author: Coby Chapple <coby@github.com>
Date:   Wed Aug 8 18:26:38 2012 -0700

    Merge pull request #360 from svanschu/master

    PHPStorm gitignore

commit de7a7117c71bb4a9ff2ac4ddbe346e2c0da85e0d
Author: Andrew Arnott <andrewarnott@gmail.com>
Date:   Wed Aug 8 16:34:59 2012 -0700

    Added .vspx and .log to .gitignore for VB

commit 6073319fb14c6de42712a21bc1aab27af2d5f580
Author: Andrew Arnott <andrewarnott@gmail.com>
Date:   Wed Aug 8 16:33:51 2012 -0700

    Added .gitignore entries for .vspx and .log

commit 2661a8201010647327a8d41d34545da8d17a158e
Author: Eduard Carreras <ecarreras@gmail.com>
Date:   Wed Aug 8 19:57:13 2012 +0300

    Adding pydev files

commit 5a860949c0858da5fe6b2ff0e64bd9256c845614
Author: Coby Chapple <coby@github.com>
Date:   Wed Aug 8 17:37:15 2012 +1000

    Remove space after Thumbs.db — fixes #355

commit 4db1b0429f567381cd3e9688e9e10bf730955760
Author: Jonas Schmid <jonas.schmid@gmail.com>
Date:   Mon Aug 6 09:09:09 2012 +0300

    Android: Ignore the proguard folder

    When exporting a signed .apk, Ecipse creates a proguard folder in the root directory. It should not be commited.

commit 6f6c2eac58900f76673bce7ad75d171c24fee27d
Author: Ali Servet Donmez <asd@pittle.org>
Date:   Fri Aug 3 12:41:27 2012 +0200

    Add .LSOverride

commit fcb11295b51f0d3edb79cf7df678e84b59126644
Merge: 5239808 3bdb155
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 20:02:12 2012 -0700

    Merge pull request #392 from lmjabreu/patch-2

    Added file exclusions, reformatted

commit 52398081c61a7d541a12e51be4c02929cc60ec72
Merge: 54769b4 0be0dd0
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 19:51:19 2012 -0700

    Merge pull request #395 from hugocf/patch-1

    Windows XP Media Center Edition also creates ehthumbs.db

commit 54769b4048d9558eeeea31466756247e2e121645
Merge: bc0c761 e2c0408
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 19:49:00 2012 -0700

    Merge pull request #400 from NameFILIP/patch-1

    Update SeamGen.gitignore

commit bc0c761efc63f20de2fd22014d159efb82d0311a
Merge: 9b566a3 9da9367
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 19:48:21 2012 -0700

    Merge pull request #399 from bfuk/patch-2

    Added ignore of W3TC cache folder (for users that might be using W3TC ca...

commit 9b566a37ad8c43d1f45ae1c7f040fcdac4d1b2f6
Merge: f43d17e ac71c88
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 19:45:14 2012 -0700

    Merge pull request #401 from rb2/master

    Fix Opencart gitignore

commit f43d17eed000363aadcfbbbc70d424eb7935d0dc
Merge: 55f8c12 3e98f92
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 19:39:30 2012 -0700

    Merge pull request #384 from thenew/patch-1

    add *.log (wp-content/debug.log)

commit 55f8c12acc5b8810d0854644674f1d8dcb5c45a7
Merge: 67083ce 027e033
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 19:29:02 2012 -0700

    Merge pull request #385 from gneatgeek/master

    Updated SASS gitignore

commit 67083ce70d41bf4004c7a8326953bab8a94cc986
Author: Coby Chapple <coby@github.com>
Date:   Fri Aug 3 12:18:45 2012 +1000

    Make CakePHP ignore config folder of either case

    This takes the change from #339 and makes it case insensitive so that CakePHP projects from both before and after the rename ignore the appropriate files.

commit f88aa40dbe96f298f554869b8598f16316af13f6
Merge: e31878f 91a1756
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Thu Aug 2 19:05:26 2012 -0700

    Merge pull request #361 from MaxNanasy/patch-1

    Removed redundant ".directory" that was already covered by ".*".

commit e31878f8bc3f9971f638618438179bb76e8a80b0
Merge: fae236e 5bb2255
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Thu Aug 2 19:03:41 2012 -0700

    Merge pull request #304 from mgold/master

    .netrwhist

commit fae236e74a38728b00d2df54d99b706316811e83
Merge: 8486f22 1bd40f5
Author: Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Date:   Thu Aug 2 19:03:14 2012 -0700

    Merge remote-tracking branch 'arsenm/patch-1'

    Conflicts:
    	C.gitignore

commit 8486f2204990f48c156408b0965142813b885043
Merge: 4709f02 0a9d0c3
Author: Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Date:   Thu Aug 2 19:02:06 2012 -0700

    Merge remote-tracking branch 'OliverLetterer/patch-1'

    Conflicts:
    	Objective-C.gitignore

commit 4709f02b41f768188afd53c72be0ca9155226ce2
Merge: ef2db78 1a2c409
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 18:54:56 2012 -0700

    Merge pull request #402 from ntotten/master

    Added Windows Azure build output files

commit ef2db786806ba96aa37ac2cbe2c09d42c6fd957d
Merge: edaff20 6e3af78
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Thu Aug 2 18:53:21 2012 -0700

    Merge pull request #388 from rhysd/master

    ignoring *.dylib (dynamic link libraries in MacOS X)

commit edaff200ff1b18d42b2817716f2ee07972a5f46a
Merge: 9f41394 1365cd4
Author: Justin Spahr-Summers <jspahrsummers@github.com>
Date:   Thu Aug 2 18:53:03 2012 -0700

    Merge pull request #390 from osteslag/patch-1

    Update to also ignore .DS_Store files

commit 9f413941646f3dad121d82e85f65380993170ffb
Merge: 4b6bf65 d19a70e
Author: Coby Chapple <coby@github.com>
Date:   Thu Aug 2 18:50:42 2012 -0700

    Merge pull request #339 from AD7six/patch-1

    the current version of Cakephp (2.x) renamed the config folder to Config

commit 1a2c40923c4ee272980bbacc2f5194cd49a84a64
Author: Nathan Totten <ntotten@microsoft.com>
Date:   Thu Aug 2 14:40:30 2012 -0700

    Added NuGet packages directory

commit d9d85d8a247ffd80ac4cc7733f5adb99dd28c4fd
Author: Nathan Totten <ntotten@microsoft.com>
Date:   Thu Aug 2 14:37:34 2012 -0700

    Added Windows Azure build output files

commit ac71c8886dcc91493349845ee4e5e4efdd28f60f
Author: Ruslan Brest <rb@labtodo.com>
Date:   Wed Aug 1 10:53:36 2012 +0300

    fix Opencart gitignore

commit e2c0408fb6687ce2d8fdd8d918beec75429af1a0
Author: Filip Spiridonov <filip.spiridonov@gmail.com>
Date:   Tue Jul 31 11:57:21 2012 +0800

    Update SeamGen.gitignore

commit 9da936706cd06cb00c01843181c08456071e5d12
Author: bfuk <bf@benfrain.com>
Date:   Tue Jul 24 11:41:47 2012 +0200

    Added ignore of W3TC cache folder (for users that might be using W3TC cache plugin)

commit 0be0dd05f7411065ae13d4919c4a6397cfe01744
Author: Hugo Ferreira <hugo@ferreira.cc>
Date:   Tue Jul 17 01:17:08 2012 +0200

    Windows XP Media Center Edition also creates ehthumbs.db which holds previews of video files.

    See http://en.wikipedia.org/wiki/Windows_thumbnail_cache#Thumbs.db

commit 3bdb155bd2ed3e83152694e783bf1d2b955f03a1
Author: Luis Abreu <lmjabreu@gmail.com>
Date:   Sun Jul 15 18:53:32 2012 +0200

    * Updated comments
    * added web.config and authorize.php
    * tweaked settings.php path to also ignore stock example.settings.php file
    * tweaked files and private folders paths to include all sites

commit 1365cd43f75ff2d6470254ec139f3e6f8b8bf653
Author: Joachim Bondo <osteslag@gmail.com>
Date:   Wed Jul 11 15:19:29 2012 +0300

    Update to also ignore .DS_Store files

commit 6e3af78e049324afab824b7b899c182f3b0fdebd
Author: rhysd <lin90162@yahoo.co.jp>
Date:   Sat Jul 7 06:11:09 2012 +0900

    ignoring dynamic link library in MacOS X

    *.dylib is an extension for dynamic link library in MacOS X.

commit 027e0338365182a90da0adc28a8a01b7d21e5b8c
Author: GneatGeek <gneatgeek@gmail.com>
Date:   Tue Jul 3 13:54:50 2012 -0700

    Updated SASS gitignore

commit 3e98f923210d41d51b53b34c408d1a7ec633cd24
Author: Rémy Barthez <remy.barthez@thenew.fr>
Date:   Mon Jul 2 10:53:25 2012 +0300

    add *.log (wp-content/debug.log)

commit 9865ef35a9307dc7e83ce8c2919ad2a87f01042d
Author: Lucas Jenss <lucas@x3ro.de>
Date:   Fri Jun 29 14:52:34 2012 +0200

    Ignore *.tdo files generated by the todonotes package

    The [todonotes package](http://www.tex.ac.uk/tex-archive/macros/latex/contrib/todonotes/todonotes.pdf)
    generates "tdo" files when you use the \listoftodos command.

commit 818ed295cf3f68e77e003f8a1f101074f6bddca6
Author: borekb <borekb@gmail.com>
Date:   Tue Jun 26 10:42:51 2012 +0300

    Project files (`.project`, `.actionScriptProperties` and `.flexProperties`) removed from .gitignore as they should be version-controlled.

commit d49148e2bdfa6d2f95ee835f68b70f3bb099cdfb
Author: Illya Kovalevskyy <kovalevskiy11@gmail.com>
Date:   Sat Jun 9 16:36:58 2012 +0300

    dynlib => dylib (msspl)

commit 93c4f1b610cb0325358d03f9102c84457154dd39
Author: Illya Kovalevskyy <kovalevskiy11@gmail.com>
Date:   Sat Jun 9 08:30:06 2012 +0300

    *.desktop removed from the list

commit cae4051346b390791380714ea79945fc2a6c0b6f
Author: Bastien Colmard <baztoune@gmail.com>
Date:   Tue Jun 5 12:38:20 2012 +0300

    Added Play 2.0 working directories
    as stated in the official documentation http://www.playframework.org/documentation/2.0/Anatomy

commit 91a1756d29131c38599af43e417b15a2340f7d6e
Author: Max Nanasy <max.nanasy@gmail.com>
Date:   Mon Jun 4 14:51:20 2012 -0700

    Removed redundant ".directory" that was already covered by ".*".

commit c27430e74c0339a3d582d9117cb5d007597835da
Author: Sven Schultschik <sven@schultschik.de>
Date:   Mon Jun 4 22:59:05 2012 +0200

    PhPStorm gitignore

commit f4530cfa0bf60fb8cfc946a76c7fd4b73085eeea
Author: Misha Manulis <misha@manulis.com>
Date:   Mon May 28 21:51:25 2012 -0700

    Adding support for SDCC compiler files

commit 603a1f268131382750f386b6f602578948c34810
Author: Illya Kovalevskyy <me@tucnak.pp.ua>
Date:   Tue May 22 22:00:28 2012 +0300

    now it support *.desktop files

commit e53ae992044dcfd51246642d45cb6a790846b347
Author: Illya Kovalevskyy <me@tucnak.pp.ua>
Date:   Tue May 22 21:50:21 2012 +0300

    added some templates

commit bacececa746442f4b29a22b9d856e7f03b3dd1c8
Author: Illya Kovalevskyy <me@tucnak.pp.ua>
Date:   Sat May 19 21:51:19 2012 +0300

    Qt-project gitignore added for Qt core developers

commit 65343523f4bd54085f0da92782c51c5d3bf5cf49
Author: Illya Kovalevskyy <me@tucnak.pp.ua>
Date:   Sat May 19 21:48:06 2012 +0300

    gitignore for Qt-project

commit 4eebde9c47a14b65f3678aac1e578e48c34827e3
Author: Björn Esser <bjoern.esser@gmail.com>
Date:   Sat May 19 12:02:40 2012 +0200

    added rule for .bz2 --> bzip2

commit 21f9741a1f439514ea4c7a55ee35bffde8a1cf7a
Author: Lucas Jenss <lucas@x3ro.de>
Date:   Thu May 10 15:25:42 2012 +0200

    The sublime-project file should be checked into version control

    It contains project specific configuration, and should therefore by
    checked into version control (as documented on
    http://www.sublimetext.com/docs/2/projects.html)

commit d19a70e2c87dc3af893bc55743e9a61af41244a5
Author: Andy Dawson <andydawson76@gmail.com>
Date:   Tue May 8 13:01:41 2012 +0300

    the current version of Cakephp (2.x) renamed the config folder to Config. adding core to the list of files to ignore as this contains security salts.

commit 720975f849ce5424393b6bbb92b038da78d50c57
Author: Mike Kenyon <mkenyon@zynga.com>
Date:   Tue May 1 15:02:46 2012 -0700

    Add OSX-specific Icon\r rule

commit 6670a4c42336cf227406a3de7090220e76b918b6
Author: Stig Brautaset <stig@brautaset.org>
Date:   Tue May 1 22:11:46 2012 +0200

    Ignore .idea/ folder for AppCode users.

commit 4b6bf65bdf0d52a58cb8f28964b6327c26fbf171
Author: Dana <danashan@gmail.com>
Date:   Fri Apr 13 15:17:09 2012 -0700

    Updated Global/VisualStudio.gitignore

commit d8fd6790011d5fa69988f47a7beec89dcc1fbf8d
Author: Sam van Kampen <samint64@gmail.com>
Date:   Sat Apr 28 15:55:20 2012 +0300

    Added __pycache__

commit a3e7652a23edfb180e6682bc0e4ff952dd742c53
Author: Rifat Nabi <to.rifat@gmail.com>
Date:   Sun Apr 22 02:15:07 2012 +0600

    duplicate entry for modules removed

commit 0a9d0c31e874488cf058c6aa55e85b45bc57c6d7
Author: Oliver Letterer <oliver.letterer@googlemail.com>
Date:   Sat Apr 21 09:59:57 2012 +0300

    Now ignoring full build directory.

commit 9a2661f88048a8ab815ea7dcf4d85adc6423e353
Author: Leonardo J .Caballero G <leonardocaballero@gmail.com>
Date:   Fri Apr 20 14:22:30 2012 -0430

    Add Plone CMS git .ignore file

commit 0537b8dc3462cd9d7e0486dc30bba129ba8311e5
Author: Nicholas Valbusa <info@squallstar.it>
Date:   Fri Apr 20 10:12:43 2012 +0200

    bancha-cms gitignore

commit 1bd40f51eee156e0883358ad5bfde4900b095e74
Author: Matt Arsenault <arsenm2@rpi.edu>
Date:   Thu Apr 19 02:50:54 2012 -0300

    Add versioned so, .a, .dylib, .app

commit 5bb2255b691cbf2375eef1117093a683f8d4fa8c
Author: Max Goldstein <maxgoldstein1@gmail.com>
Date:   Thu Apr 19 00:46:16 2012 -0300

    Include .netrwhist, the user's history and potential privacy concern. See: http://stackoverflow.com/questions/9850360/

commit dfb30c64093aa7033755bc4f472e194886630b1e
Author: Safwan Choudhury <im@safwanc.com>
Date:   Wed Apr 18 23:15:10 2012 -0400

    Ignoring compiled MEX binaries for all platforms

    Including mexglx, mexa64, mexmaci64, mexw32 & mex64 (see
    http://sfwn.in/FxbE for official list from Mathworks).

commit a66b53a87da869a24ddc3ca6bcac3034121752e6
Author: Paul Betts <paul@github.com>
Date:   Wed Apr 18 14:47:31 2012 -0700

    Same deal as the C# file, merge in the VS.gitignore for now

commit e1c4a4872986de590e1bfacfc5a1ad93c356a898
Author: Yurii Rashkovskii <yrashk@gmail.com>
Date:   Wed Apr 18 14:46:06 2012 -0700

    priv is a legitimate part of an OTP application

commit c594ee4c231611c5702f364f98e56859b94313e1
Author: Paul Betts <paul@github.com>
Date:   Wed Apr 18 14:45:09 2012 -0700

    Copy/paste Global/VisualStudio.gitignore into here for now

commit f7acf5b08f8269691b51587cfb3d270f266cbc8e
Merge: 8d26ebf 3aa2b49
Author: Paul Betts <paul@github.com>
Date:   Wed Apr 18 14:41:08 2012 -0700

    Merge pull request #252 from EugeneKay/master

    Global/Windows: Recycle Bins on network shares

commit 8d26ebfe7703544899adc2a72156dc04d3f40baf
Merge: 367021e 4997747
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:06:57 2012 -0700

    Merge pull request #277 from thizzle/patch-1

    Updated Magento.gitignore for the latest Enterprise edition.

commit 367021e8f422cab3a554a30833fb3ae4133c476d
Merge: 59da2bd e131e0a
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:05:44 2012 -0700

    Merge pull request #281 from jstasiak/master

    Add Unity gitignore

commit 59da2bdecda5ba30fa578439ad58ce2fce0cd0a8
Merge: 6b91f1f 2f4a4b2
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:05:07 2012 -0700

    Merge pull request #293 from adericbourg/master

    C

commit 6b91f1f588c972dc6b4e2e7447d5f4c3922211c6
Merge: 81341ec f55e013
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:03:57 2012 -0700

    Merge pull request #251 from JoshuaEstes/master

    added another path (Symfony.gitignore)

commit 81341ec3bf3c734cb227f6516ef2c4d1b52bd7e9
Merge: 2185c29 f063641
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:02:26 2012 -0700

    Merge pull request #248 from stuffmc/patch-1

    DerivedData is the "build/" Folder that *might* be in your Project's fol...

commit 2185c29054972a7e99b611af6fba4ab6c6ddf8c7
Merge: e92d9a4 e8752f7
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:01:31 2012 -0700

    Merge pull request #241 from philwareham/master

    Add Textpattern gitignore

commit e92d9a49c3e3833971385caf65ad62796e04171d
Merge: 3bfc356 23673d6
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:01:18 2012 -0700

    Merge pull request #242 from rpavlik/sketchup

    Add gitignore for sketchup backup files.

commit 3bfc3561bfa7de966a396021f3d57c514595f658
Merge: 7ddba59 9a2901c
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:00:57 2012 -0700

    Merge pull request #245 from IQAndreas/patch-1

    ActionScript: Added "bin" folder

commit 7ddba597caf4df524e92c74ee043f680735c1b00
Merge: e7781f8 1c6ecb3
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 12:00:08 2012 -0700

    Merge pull request #237 from caarlos0/master

    Added GWT Project related paths to a new GWT.gitignore file.

commit e7781f83b25c3564b2ada80810c7298047a6bff7
Merge: 53c1a04 5a7f291
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:59:55 2012 -0700

    Merge pull request #238 from rikkert/master

    lib/ and modules/

commit 53c1a04bd2981afcbf5d540a43963d802d733d74
Merge: ffe0448 541e852
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:59:39 2012 -0700

    Merge pull request #235 from aoberoi/pr-node_modules

    Remove node_modules from Node.gitignore

commit ffe0448a4c3430bb847da5a5411dd2a4b59797b4
Merge: a3ca100 26921c0
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:57:04 2012 -0700

    Merge pull request #287 from ogier/xilinx-ise

    Added Xilinx ISE gitignore

commit a3ca100987ad0d604d900b11d30684e214fcaafb
Merge: 6cd38c5 c7ff9c5
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:56:45 2012 -0700

    Merge pull request #288 from adilmughal/patch-1

    Update Global/VisualStudio.gitignore

commit 6cd38c564fb7733db4261e302d2fe23baca04d74
Merge: 3ef6e03 8ad25f7
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:56:03 2012 -0700

    Merge pull request #228 from thiagocaiubi/patch-1

    Adds modules

commit 3ef6e03038c534c9b70ee943cae83692fbfd4432
Merge: cf9c028 435bd72
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:50:25 2012 -0700

    Merge pull request #217 from pmeissner/patch-1

    added content_*.php with a suggestion

commit cf9c028deb1f11d6d6aecb8c699ccc185af2bf8a
Merge: 0393836 24372f9
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:49:26 2012 -0700

    Merge pull request #214 from dtrebbien/patch-1

    VisualStudio.gitignore: Ignore the ‘x64’ directories

commit 039383609367d554a27ec6f90e8266ab80b6473a
Merge: b072f3a 8cc0784
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:47:31 2012 -0700

    Merge pull request #260 from gneatgeek/master

    SASS ignore File

commit b072f3a239882533aa519e1c36acd9561719708d
Merge: 4cede2e cbf52e3
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:47:18 2012 -0700

    Merge pull request #262 from jja/patch-1

    a more complete .gitignore for Grails 1.2 and 1.3

commit 4cede2e9d583e99c2ca555c79cf8066844074431
Merge: 72835fe 5b28760
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:47:03 2012 -0700

    Merge pull request #266 from joshminnie/master

    Bumpy case StyleCop file wasn't being ignored

commit 72835feb15658acd3c9dea6dab38a9ad6e6e177c
Merge: 31a2a88 c0d30d5
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:46:11 2012 -0700

    Merge pull request #268 from jrhorn424/emacs-org-mode

    Added Org-mode section to Emacs ignore file

commit 31a2a88cc7552be8259af262d960aac53afa9f05
Merge: 1cd535e ed7b451
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:44:39 2012 -0700

    Merge pull request #280 from jasonkarns/oracle_forms

    added gitignore for Oracle Forms development

commit 1cd535ec039fe30497171f8989a34b105f034605
Merge: 2839977 5fb6627
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:44:15 2012 -0700

    Merge pull request #283 from hjfactory/master

    Add Delphi gitignore

commit 2839977ec1b507ccb9587c3d05415d7e6e5e3910
Merge: c483d6f f71524c
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:44:00 2012 -0700

    Merge pull request #284 from cmoore/patch-1

    Added .virthualenv directory.

commit c483d6fdd38117a7dc1bdd7741c17d3c21e93872
Merge: a743349 5872a72
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:43:25 2012 -0700

    Merge pull request #285 from philipproplesch/master

    Added NuGet "packages" directory and some NCrunch files to the VisualStudio.gitignore

commit a74334932893818bce45e3453df9021d723d9192
Merge: 9fb6b97 bf51b78
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:43:03 2012 -0700

    Merge pull request #290 from kanduvisla/patch-1

    added symphony and workspace/uploads dir

commit 9fb6b9768586a955e0ec33754094610c85608f09
Merge: 33f4cd5 3ad9eda
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:42:49 2012 -0700

    Merge pull request #289 from allonhadaya/patch-1

    Ignore '.project' and '.classpath' to avoid conflict between development environments.

commit 33f4cd5d715c77081c7888a1d1aaf1faad4fb31e
Merge: 07a8622 67d649e
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:40:44 2012 -0700

    Merge pull request #291 from matheussl/master

    Add ignore extensions for Python and SublimeText

commit 07a862293f1e1682b7bd15313c20fa455a58ca42
Merge: 45b39fa b0594af
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:39:24 2012 -0700

    Merge pull request #223 from ivanvc/master

    Remove trailing spaces from Drupal's gitignore file

commit 45b39fabf7ff4d28af4a546b47135ee457659fa4
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:38:58 2012 -0700

    Group custom/ dirs in SugarCRM ignore

commit 9ee6788e7caaade0280fe323646264174714eaa0
Merge: e8576fa 38c6af6
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:38:27 2012 -0700

    Merge pull request #213 from jwhitcraft/patch-1

    Update SugarCRM.gitignore

commit e8576fa0cb50f22b98ae9d168de5a93cb3b20910
Merge: 7e2a415 f0d9ce4
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:37:30 2012 -0700

    Merge pull request #207 from shieldo/patch-1

    Changed parameters.ini to parameters.*.

commit 7e2a415443f696ed53a7ad0824073ade6f4f2192
Merge: 1a188f2 bf8796a
Author: Chris Wanstrath <chris@ozmm.org>
Date:   Wed Apr 18 11:37:16 2012 -0700

    Merge pull request #206 from julian-gehring/master

    add gitignore for R

commit 8cc0784302b8c8aeba437819290149475fb5ba7b
Merge: bd20a55 1a188f2
Author: GneatGeek <gneatgeek@gmail.com>
Date:   Sun Apr 15 00:04:01 2012 -0700

    Merge remote-tracking branch 'upstream/master'

commit 67d649e1531636fd747daae6830a6fb104bb8804
Author: Matheus dos Santos Lima <matheus.se@gmail.com>
Date:   Thu Apr 12 17:48:45 2012 -0300

    add '.sublime-workspace' in Global/SublimeText.gitignore

commit 39dbe57df7d9d08dc396e78a586a413205f1383c
Author: Matheus dos Santos Lima <matheus.se@gmail.com>
Date:   Thu Apr 12 16:21:38 2012 -0300

    add '.pyd' and '.so' (C extensions) in Python.gitignore

commit 933578cbb128f520c5bd378d8cf43b684a087428
Author: Matheus dos Santos Lima <matheus.se@gmail.com>
Date:   Thu Apr 12 16:11:18 2012 -0300

    add 'lib' and 'lib64' to Python gitignore.

commit bf51b786a396e4102e8a810184c93763e1ecfb58
Author: Giel Berkers <info@gielberkers.com>
Date:   Wed Apr 11 11:39:01 2012 +0300

    added symphony and workspace/uploads dir

commit 3ad9edaa260b62de4177dae060bda0ecfcbc3ff0
Author: Allon Hadaya <allonhadaya@hotmail.com>
Date:   Tue Apr 10 22:07:22 2012 -0300

    Ignore '.project' and '.classpath' to avoid conflict between development environments.

commit c7ff9c5c75db4ddeb4d83a92f457df8bcac09b58
Author: Adil Mughal <adil.mughal@live.com>
Date:   Tue Apr 10 23:01:00 2012 +0600

    Update Global/VisualStudio.gitignore

commit 26921c039a459aa91c27076359eb2d9284f92cd9
Author: Alex Ogier <alex.ogier@gmail.com>
Date:   Mon Apr 9 21:21:28 2012 -0400

    Added Xilinx ISE gitignore

commit 5872a725794e137a33b4d2b522b6234a50c84e5b
Author: Philip Proplesch <philip@proplesch.de>
Date:   Tue Apr 3 12:38:46 2012 +0200

    Added NuGet and NCrunch to VisualStudio.gitignore

commit f71524c5bd3279c93ed4cb2525fd8978bf4e4461
Author: Clint Moore <clint@ivy.io>
Date:   Sun Apr 1 00:28:35 2012 -0700

    Added .virthualenv directory.

commit e131e0a68f99aa03433acac6b30fa5418e9270ed
Author: Jakub Stasiak <kuba.stasiak@gmail.com>
Date:   Sat Mar 24 23:22:27 2012 +1100

    Add Unity gitignore

commit ed7b451e45298e38196a7bae24934625778032a6
Author: Jason Karns <jason@karns.name>
Date:   Mon Mar 19 16:39:16 2012 -0400

    added gitignore for Oracle Forms development

commit f0d9ce471af3a283731738800c72a230be394348
Author: Douglas Greenshields <dgreenshields@gmail.com>
Date:   Wed Oct 19 01:34:22 2011 +0200

    Added parameters.yml to list for Symfony2.

    Symfony 2.0.4 changed standard to using a parameters.yml file, so this change allows for both variants.

commit 49977476d3de60f00206326a72acbbf12be3ef22
Author: Tharsan Bhuvanendran <me@tharsan.com>
Date:   Fri Mar 16 18:49:26 2012 -0300

    Restored missing lines.

commit c6a23ad6d5e2748fe9f9c5b0e4447fd377351f82
Author: Tharsan Bhuvanendran <me@tharsan.com>
Date:   Fri Mar 16 18:47:11 2012 -0300

    Updated Magento.gitignore for the latest Enterprise edition.

commit c0d30d58697fe36bfc7f812a779fedeaf0b49413
Author: Jeffrey Horn <jrhorn424@gmail.com>
Date:   Thu Mar 8 19:12:55 2012 -0500

    Added Org-mode section to Emacs ignore file

    Org-mode stores archived TODOs from todo.org into todo.org_archive. It also
    creates .org-id-locations in some cases.

commit 5b2876071dc87f9156786c2f2e8390389ca634a9
Author: Joshua Minnie <josh.minnie@gmail.com>
Date:   Thu Mar 8 15:53:34 2012 -0500

    StyleCop file was sometimes bumpy case

commit 5fb6627cd42b3d0156e606b36a3a32b9544d63a2
Author: hjF <hjfactory@gmail.com>
Date:   Thu Mar 8 20:45:16 2012 +0900

    Delphi gitignore

commit bd20a55b30888672b89c832f76a263c4a2423607
Author: GneatGeek <gneatgeek@gmail.com>
Date:   Mon Feb 20 15:56:24 2012 -0800

    Added SASS ignore file.

commit cbf52e39a4ed150c365baff38cc5f49a5f6340d8
Author: John J. Allison <jja@sinequanon.net>
Date:   Mon Feb 6 12:47:44 2012 -0700

    a more complete .gitignore for Grails 1.2 and 1.3

commit 3aa2b49364d8510824ea7f109dbcdd31e80f704b
Author: Eugene E. Kashpureff Jr <eugene@kashpureff.org>
Date:   Thu Feb 2 11:39:55 2012 -0600

    Add Recycle Bin on file shares

commit f55e013690f3b891065b761082a9d1159d11f341
Author: Joshua Estes <Joshua.Estes@ScenicCityLabs.com>
Date:   Thu Feb 2 09:58:20 2012 -0600

    symfony creates symlinks to plugins in the web folder

commit f06364113fdcbccb8bb818fafd7749fc42b1f106
Author: StuFF mc <mc@stuffmc.com>
Date:   Sat Jan 28 12:42:12 2012 +0100

    DerivedData is the "build/" Folder that *might* be in your Project's folder if you use the default Xcode 4 settings.

commit 9a2901c3efabc8b29f3afe4658f19b63973c083f
Author: Andreas Renberg <iq_andreas@hotmail.com>
Date:   Mon Jan 23 15:47:18 2012 +0100

    By default, FDT5 just uses a "bin" folder (rather than the common "bin-debug" and "bin-release")

commit 23673d6c99eb725c2142e9fface78d92651d9cae
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date:   Wed Jan 18 17:33:11 2012 -0600

    Add gitignore for sketchup backup files.

commit e8752f766b7e18dfa9c35d2384b7689cf55cef1e
Author: Phil Wareham <phil@designhive.com>
Date:   Tue Jan 17 11:04:16 2012 +0000

    Added Textpattern gitignore

commit 5a7f2910eb0f25ef6784de3e42a62346e6dcf9e9
Author: Ramiro Rikkert <rrikkert@gmail.com>
Date:   Fri Jan 13 09:28:28 2012 +0100

    Add lib/ and modules/.

commit 1c6ecb30dc9737fed5fdc386b3f3b96c86ca1393
Author: Carlos Alexandro Becker <caarlos0@gmail.com>
Date:   Thu Jan 12 16:37:34 2012 -0200

    better now.

commit 97dd10e872fd882f2551b53c1d7eaaa258d8f8ce
Author: Carlos Alexandro Becker <caarlos0@gmail.com>
Date:   Thu Jan 12 00:16:04 2012 -0200

    added GWT project git ignore related paths.

commit 541e85287f1f6077581271e1de6ca1160dcf6968
Author: Ankur Oberoi <aoberoi@gmail.com>
Date:   Fri Jan 6 00:30:03 2012 -0500

    checking in the node_modules dir is best practice for app developers
    according to the community since recent changes.

    see: http://www.mikealrogers.com/posts/nodemodules-in-git.html
    by @mikeal
    (cherry picked from commit 44b47ec5bd0222ccf55efe5bcdb8bd3c55271803)

commit 8ad25f7730bd8ff2974bd3cdeac1d358d6548702
Author: Thiago Caiubi <thiago.caiubi@gmail.com>
Date:   Sun Dec 11 01:58:58 2011 -0200

    Adds modules. It is used to keep the full path of each module required by the application. It can be generated using: '$ play dependencies --sync'

commit b0594af16d3e95bfb67ee79cbbc2cc3f05ef39a8
Author: Ivan Valdes (@ivanvc) <ivan@ooyala.com>
Date:   Wed Nov 30 11:59:19 2011 -0600

    Remove trailing spaces from Drupal file

commit 435bd7227cd48bbb1374f22f1097b824843a105f
Author: pmeissner <pcmeissner@gmail.com>
Date:   Sun Nov 13 13:24:49 2011 -0500

    added content_*.php with a suggestion

commit 7ce12c766a28512aaf710b95a31dcb92a57efbc4
Author: Nadim Khemir <nadim.khemir@gmail.com>
Date:   Wed Nov 9 00:41:11 2011 +0100

    Do not ignore directory matching /Build/

commit 24372f9c4a15aa39143f32c1e9da4288d33f7840
Author: Daniel Trebbien <dtrebbien@gmail.com>
Date:   Sun Nov 6 09:16:21 2011 -0500

    VisualStudio.gitignore: Ignore the ‘x64’ directories

commit 38c6af6a76a8bcea65cb1ecff8fac6b431d62e54
Author: Jon Whitcraft <jwhitcraft@sugarcrm.com>
Date:   Thu Oct 27 11:05:08 2011 -0300

    Update SugarCRM.gitignore

commit 8a47a81dde462de1852f1f0550710afade29983c
Author: ikeike443 <ikeike443@gmail.com>
Date:   Thu Oct 27 11:04:05 2011 +0900

    Delete duplicated "eclipse" and support ignoring IDEA's metafile such as *.iml, *.eml

commit bf8796aecedfc5f9b84d59f0a2d41d1d68232f53
Author: Julian Gehring <julian.gehring@googlemail.com>
Date:   Sat Oct 8 09:23:47 2011 +0200

    add 'R.gitignore' for R