[printoxx/f13/master: 3/3] Merge remote branch 'origin/master' into f13/master

[Pavel Alexeev]

commit bc260c0a435f19b65bb4b2c1efa86732a2f4cda5
Merge: 2928ec4 8309b21
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Tue Jan 18 00:35:26 2011 +0300

    Merge remote branch 'origin/master' into f13/master

 .gitignore    |    1 +
 printoxx.spec |   31 +++++++++++++++++--------------
 sources       |    3 +--
 3 files changed, 19 insertions(+), 16 deletions(-)
---