Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Gaetan Semet 2014-03-06 17:12:25 +01:00
commit 20804add97

View file

@ -0,0 +1,4 @@
#
# Your guess is as good as mine. Let's just assume that we will need this...
# - For more info visit... http://atom.io/
#