Merge branch 'ticket/p/10096' into develop-olympus

* ticket/p/10096:
  [ticket/10096] Fixed whitespace in functions.php.
This commit is contained in:
Andreas Fischer 2011-03-14 13:58:21 +01:00
commit c75b299eb1