[drupal6-flag: 2/3] Merge branch 'master' into el6

[Shawn Iwinski]

commit c4b2c240c867b94f78d27f5b14f048ba7a9e6834
Merge: 292de98 0c42bab
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Wed Dec 31 16:53:08 2014 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	drupal6-flag.spec
    	sources

 .gitignore                     |    1 +
 LICENSE.txt                    |  280 ----------------------------------------
 drupal6-flag-fedora-README.txt |    6 -
 drupal6-flag.spec              |  113 +++++++++++-----
 sources                        |    2 +-
 5 files changed, 79 insertions(+), 323 deletions(-)
---