Merge branch 'upstream' into debian/sid

1 files changed, 8 insertions, 8 deletions

diff --git a/data/v2/samples/accelerando.charles_stross.sst b/data/v2/samples/accelerando.charles_stross.sst
index c4ca72f..c07ef20 100644
--- a/data/v2/samples/accelerando.charles_stross.sst
+++ b/data/v2/samples/accelerando.charles_stross.sst
@@ -4,7 +4,7 @@
 
 @creator: Stross, Charles
 
-@rights: 
+@rights:
  :copyright: Copyright (C) Charles Stross, 2005.
  :license:  Creative Commons License, Attribution-NonCommercial-NoDerivs 2.0: * Attribution. You must attribute the work in the manner specified by the author or licensor; * Noncommercial. You may not use this work for commercial purposes; * No Derivative Works. You may not alter, transform, or build upon this work; * For any reuse or distribution, you must make clear to others the license terms of this work. (* For any reuse or distribution, you must make clear to others the license terms of this work. * Any of these conditions can be waived if you get permission from the copyright holder.) http://creativecommons.org/licenses/by-nc-nd/2.0/ These SiSU presentations of Accelerando are done with the kind permission of the author Charles Stross
 
@@ -5794,27 +5794,27 @@ He knows what she's asking. "Be my mistress?" he asks, offering her a hand.
 %     * Noncommercial. You may not use this work for commercial purposes.
 %     * No Derivative Works. You may not alter, transform, or build upon this work.
 %     * For any reuse or distribution, you must make clear to others the license terms of this work.
-% 
+%
 % If you are in doubt about any proposed reuse, you should contact the author via: www.accelerando.org.
 
 % Contents
 
 % Part 1: Slow Takeoff
-% 
+%
 %         * Lobsters
 %         * Troubadour
 %         * Tourist
-% 
+%
 % Part 2: Point of Inflection
-% 
+%
 %         * Halo
 %         * Router
 %         * Nightfall
-% 
+%
 % Part 3: Singularity
-% 
+%
 %         * Curator
 %         * Elector
 %         * Survivor
 
-% problem with transformation ^{+4904}^/,{-56}, is not transformed correctly, corrected for >= sisu-0.49.1 
+% problem with transformation ^{+4904}^/,{-56}, is not transformed correctly, corrected for >= sisu-0.49.1