[ghc-xmonad-contrib/el6] (2 commits) ...Merge remote-tracking branch 'origin/master' into el6

[Jens Petersen]

Summary of changes:

  1d1c0e6... add license to ghc_files (*)
  19b1af3... Merge remote-tracking branch 'origin/master' into el6

(*) This commit already existed in another branch; no separate mail sent