[corebird/f20: 2/2] Merge branch 'master' into f20

[ryan lerch]

commit 472ee570355bb32b6846dc427a25a0deba3fce87
Merge: 15b386c 8cf43c9
Author: Ryan Lerch <ryanlerch at gmail.com>
Date:   Tue Feb 4 13:54:41 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    2 ++
 sources    |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
---