[codeblocks/f21: 7/7] Merge branch 'master' into f21

[Dan Horák]

commit 315b252ad55146aed885d413ce44ba387595fe3a
Merge: 8c4be50 243e7db
Author: Dan Horák <dan at danny.cz>
Date:   Fri Dec 12 09:17:04 2014 +0100

    Merge branch 'master' into f21

 codeblocks-13.12-astyle-2.05.patch           |  214 ++++++++++++++++++
 codeblocks-13.12-spellchecker-settings.patch |   34 +++
 codeblocks-13.12-unbundle.patch              |  302 ++++++++++++++++----------
 codeblocks.spec                              |   66 ++++--
 sources                                      |    2 +-
 5 files changed, 485 insertions(+), 133 deletions(-)
---