cacert-devel.git
5 years agobug 1138: Only use support engineer mode if not viewing own history
Michael Tänzer [Fri, 11 Apr 2014 21:38:34 +0000 (23:38 +0200)] 
bug 1138: Only use support engineer mode if not viewing own history

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Code style
Michael Tänzer [Fri, 11 Apr 2014 21:25:08 +0000 (23:25 +0200)] 
bug 1138: Code style

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Typo
Michael Tänzer [Fri, 11 Apr 2014 21:14:33 +0000 (23:14 +0200)] 
bug 1138: Typo

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Actually output the domain styling
Michael Tänzer [Fri, 11 Apr 2014 21:06:27 +0000 (23:06 +0200)] 
bug 1138: Actually output the domain styling

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Properly call output_log_domains()
Michael Tänzer [Fri, 11 Apr 2014 21:00:27 +0000 (23:00 +0200)] 
bug 1138: Properly call output_log_domains()

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: simplify logic for email address output styling
Michael Tänzer [Fri, 11 Apr 2014 21:00:01 +0000 (23:00 +0200)] 
bug 1138: simplify logic for email address output styling

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Properly display domain table
Michael Tänzer [Fri, 11 Apr 2014 20:32:06 +0000 (22:32 +0200)] 
bug 1138: Properly display domain table

- Wrong call to get_domains() => deleted domains weren't included
- <td> needs to be wrapped in a <tr>

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Always show email address table
Michael Tänzer [Fri, 11 Apr 2014 20:28:46 +0000 (22:28 +0200)] 
bug 1138: Always show email address table

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: more intuitive variable naming
Michael Tänzer [Fri, 11 Apr 2014 20:19:05 +0000 (22:19 +0200)] 
bug 1138: more intuitive variable naming

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Inline $colspandefault because it make the code more complex and
Michael Tänzer [Fri, 11 Apr 2014 20:15:51 +0000 (22:15 +0200)] 
bug 1138: Inline $colspandefault because it make the code more complex and
isn't very useful

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: properly display announcement settings on account history
Michael Tänzer [Fri, 11 Apr 2014 20:11:43 +0000 (22:11 +0200)] 
bug 1138: properly display announcement settings on account history

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Make testing for support access to account details page more
Michael Tänzer [Fri, 11 Apr 2014 20:04:12 +0000 (22:04 +0200)] 
bug 1138: Make testing for support access to account details page more
robust and possibly fix some issues

- should check for same userid not whether we come from the SE page
- always use the already validated values (not $_REQUEST)
- make if clause logic more readable

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: make string more readable for translators
Michael Tänzer [Fri, 11 Apr 2014 16:51:39 +0000 (18:51 +0200)] 
bug 1138: make string more readable for translators

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Use CSS styling instead of deprecated attributes
Michael Tänzer [Fri, 11 Apr 2014 16:39:54 +0000 (18:39 +0200)] 
bug 1138: Use CSS styling instead of deprecated attributes

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Source code layout
Michael Tänzer [Fri, 11 Apr 2014 16:38:15 +0000 (18:38 +0200)] 
bug 1138: Source code layout

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Remove double escaping
Michael Tänzer [Fri, 11 Apr 2014 16:03:07 +0000 (18:03 +0200)] 
bug 1138: Remove double escaping

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Sanitize ticket number against XSS
Michael Tänzer [Fri, 11 Apr 2014 15:42:01 +0000 (17:42 +0200)] 
bug 1138: Sanitize ticket number against XSS

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Unused variable
Michael Tänzer [Fri, 11 Apr 2014 15:13:22 +0000 (17:13 +0200)] 
bug 1138: Unused variable

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Don't double escape
Michael Tänzer [Fri, 11 Apr 2014 15:09:42 +0000 (17:09 +0200)] 
bug 1138: Don't double escape

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Correct spelling / meaning
Michael Tänzer [Fri, 11 Apr 2014 14:38:41 +0000 (16:38 +0200)] 
bug 1138: Correct spelling / meaning

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Use blocks in if clauses and make logic explicit
Michael Tänzer [Mon, 7 Apr 2014 16:49:04 +0000 (18:49 +0200)] 
bug 1138: Use blocks in if clauses and make logic explicit

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Adjust the rest of the output_*_certs() functions
Michael Tänzer [Mon, 7 Apr 2014 16:36:25 +0000 (18:36 +0200)] 
bug 1138: Adjust the rest of the output_*_certs() functions

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: only show "change comment" check boxes when not read only
Michael Tänzer [Mon, 7 Apr 2014 14:59:06 +0000 (16:59 +0200)] 
bug 1138: only show "change comment" check boxes when not read only

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Add $readonly parameter to output_client_cert functions
Michael Tänzer [Mon, 7 Apr 2014 14:22:08 +0000 (16:22 +0200)] 
bug 1138: Add $readonly parameter to output_client_cert functions

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Reorder if clauses for better readability
Michael Tänzer [Mon, 7 Apr 2014 13:52:20 +0000 (15:52 +0200)] 
bug 1138: Reorder if clauses for better readability

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Code clean-up
Michael Tänzer [Mon, 7 Apr 2014 13:22:25 +0000 (15:22 +0200)] 
bug 1138: Code clean-up

Indentation and such

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: update docstrings
Michael Tänzer [Mon, 7 Apr 2014 13:18:35 +0000 (15:18 +0200)] 
bug 1138: update docstrings

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Properly compare against datetime strings
Michael Tänzer [Mon, 7 Apr 2014 13:16:23 +0000 (15:16 +0200)] 
bug 1138: Properly compare against datetime strings

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: rename interface to better describe what these functions do
Michael Tänzer [Sun, 6 Apr 2014 23:22:06 +0000 (01:22 +0200)] 
bug 1138: rename interface to better describe what these functions do

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Don't include not yet verified email addresses
Michael Tänzer [Sun, 6 Apr 2014 23:20:50 +0000 (01:20 +0200)] 
bug 1138: Don't include not yet verified email addresses

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Make code more resilient to changes
Michael Tänzer [Sun, 6 Apr 2014 23:17:43 +0000 (01:17 +0200)] 
bug 1138: Make code more resilient to changes

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Clean up docstrings
Michael Tänzer [Sun, 6 Apr 2014 23:15:31 +0000 (01:15 +0200)] 
bug 1138: Clean up docstrings

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: consistent handling for get_*_certs() functions
Michael Tänzer [Sun, 6 Apr 2014 23:08:48 +0000 (01:08 +0200)] 
bug 1138: consistent handling for get_*_certs() functions

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: don't alias columns that could cause ambiguities
Michael Tänzer [Sun, 6 Apr 2014 23:06:20 +0000 (01:06 +0200)] 
bug 1138: don't alias columns that could cause ambiguities

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Error handling when inserting to the admin log
Michael Tänzer [Tue, 1 Apr 2014 23:02:23 +0000 (01:02 +0200)] 
bug 1138: Error handling when inserting to the admin log

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Common argument ordering for user_agreement getters
Michael Tänzer [Tue, 1 Apr 2014 16:41:21 +0000 (18:41 +0200)] 
bug 1138: Common argument ordering for user_agreement getters

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Documentation and minor fixes
Michael Tänzer [Mon, 31 Mar 2014 15:13:49 +0000 (17:13 +0200)] 
bug 1138: Documentation and minor fixes

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: $_SESSION['support'] is not used anywhere => remove it
Michael Tänzer [Mon, 24 Mar 2014 16:46:24 +0000 (17:46 +0100)] 
bug 1138: $_SESSION['support'] is not used anywhere => remove it

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Removing dead code instead of only commenting it out helps
Michael Tänzer [Mon, 24 Mar 2014 16:29:39 +0000 (17:29 +0100)] 
bug 1138: Removing dead code instead of only commenting it out helps
healthful code growth

(Reducing lines of code is good code growth)

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Properly check for empty string
Michael Tänzer [Mon, 24 Mar 2014 16:27:23 +0000 (17:27 +0100)] 
bug 1138: Properly check for empty string

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Move back link out of the translation string
Michael Tänzer [Mon, 24 Mar 2014 16:00:53 +0000 (17:00 +0100)] 
bug 1138: Move back link out of the translation string

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Always take the intval of userid
Michael Tänzer [Mon, 24 Mar 2014 15:46:34 +0000 (16:46 +0100)] 
bug 1138: Always take the intval of userid

Either check for $_REQUEST['userid']) !== "" or unconditionally convert
to integer. Checking for intavl() != "" gives a false impression of what's
happening.

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: Fix indentation
Michael Tänzer [Mon, 24 Mar 2014 14:59:34 +0000 (15:59 +0100)] 
bug 1138: Fix indentation

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge branch 'release' into bug-1138
Michael Tänzer [Mon, 24 Mar 2014 14:03:15 +0000 (15:03 +0100)] 
Merge branch 'release' into bug-1138

5 years agoMerge remote-tracking branch 'origin/bug-448' into release
Michael Tänzer [Fri, 21 Mar 2014 18:08:04 +0000 (19:08 +0100)] 
Merge remote-tracking branch 'origin/bug-448' into release

5 years agoMerge remote-tracking branch 'origin/bug-1257' into release
Michael Tänzer [Fri, 21 Mar 2014 18:00:52 +0000 (19:00 +0100)] 
Merge remote-tracking branch 'origin/bug-1257' into release

5 years agoMerge remote-tracking branch 'origin/bug-1239' into release
Michael Tänzer [Fri, 21 Mar 2014 17:48:04 +0000 (18:48 +0100)] 
Merge remote-tracking branch 'origin/bug-1239' into release

5 years agoMerge branch 'tarballs' into release
Michael Tänzer [Tue, 11 Mar 2014 22:52:29 +0000 (23:52 +0100)] 
Merge branch 'tarballs' into release

5 years agoSource code taken from cacert-20140310.tar.bz2
Michael Tänzer [Tue, 11 Mar 2014 22:51:11 +0000 (23:51 +0100)] 
Source code taken from cacert-20140310.tar.bz2

5 years agobug 1257: added check if data is given bug-1257
INOPIAE [Tue, 11 Mar 2014 22:26:43 +0000 (23:26 +0100)] 
bug 1257: added check if data is given

5 years agobug 448: Properly escape data that comes from the database bug-448
Benny Baumann [Tue, 11 Mar 2014 21:51:07 +0000 (22:51 +0100)] 
bug 448: Properly escape data that comes from the database

5 years agobug 1138: added $ticketno to function call
INOPIAE [Tue, 11 Mar 2014 21:45:34 +0000 (22:45 +0100)] 
bug 1138: added $ticketno to function call

5 years agoMerge branch 'bug-1255' into release
Benny Baumann [Sun, 9 Mar 2014 19:38:16 +0000 (20:38 +0100)] 
Merge branch 'bug-1255' into release

5 years agobug 1255: Use if blocks instead of switch because big switches are easy to bug-1255
Michael Tänzer [Sun, 9 Mar 2014 02:59:51 +0000 (03:59 +0100)] 
bug 1255: Use if blocks instead of switch because big switches are easy to
break in maintenance

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1255: Mixed up variable names for pub/Y, don't calculate the bit size
Michael Tänzer [Sun, 9 Mar 2014 02:47:32 +0000 (03:47 +0100)] 
bug 1255: Mixed up variable names for pub/Y, don't calculate the bit size
of all variables

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1255: Fix syntax error (bracketing)
Michael Tänzer [Sun, 9 Mar 2014 02:09:26 +0000 (03:09 +0100)] 
bug 1255: Fix syntax error (bracketing)

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1255: Check for other algorithms than RSA in check_weak_keys()
Michael Tänzer [Sun, 9 Mar 2014 02:00:33 +0000 (03:00 +0100)] 
bug 1255: Check for other algorithms than RSA in check_weak_keys()

Implemented a check for DSA but is currently disable because the OpenSSL
on the signer would fail anyway. Unknown algorithms are now blocked.

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1138: moved write_se_log from account.php to account/59.php
INOPIAE [Tue, 4 Mar 2014 22:05:21 +0000 (23:05 +0100)] 
bug 1138: moved write_se_log from account.php to account/59.php

5 years agobug 1138: moved white spaces from back to front of statement
INOPIAE [Tue, 25 Feb 2014 22:46:47 +0000 (23:46 +0100)] 
bug 1138: moved white spaces from back to front of statement

5 years agobug 1138: removed double intval
INOPIAE [Tue, 25 Feb 2014 22:44:31 +0000 (23:44 +0100)] 
bug 1138: removed double intval

5 years agobug 1138: implemented css classes in notary
INOPIAE [Tue, 25 Feb 2014 22:38:30 +0000 (23:38 +0100)] 
bug 1138: implemented css classes in notary

5 years agobug 1138: changed css
INOPIAE [Tue, 25 Feb 2014 22:23:39 +0000 (23:23 +0100)] 
bug 1138: changed css

5 years agobug 448: Inline the static string in printf() and add a note to translators
Michael Tänzer [Tue, 25 Feb 2014 22:00:38 +0000 (23:00 +0100)] 
bug 448: Inline the static string in printf() and add a note to translators
instead

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1136: added intval for $_REQUEST['userid']
INOPIAE [Tue, 25 Feb 2014 21:59:19 +0000 (22:59 +0100)] 
bug 1136: added intval for $_REQUEST['userid']

5 years agobug 1138: fixed the wrong output in the 44 / 59 php.
mam [Sat, 22 Feb 2014 13:17:25 +0000 (14:17 +0100)] 
bug 1138: fixed the wrong output in the 44 / 59 php.

5 years agobug 1138: changed $_REQUEST['action'] to $actionrequest for ID 43
mam [Sat, 22 Feb 2014 06:32:03 +0000 (07:32 +0100)] 
bug 1138: changed $_REQUEST['action'] to $actionrequest for ID 43

5 years agobug 1138: removed blank admin log emtry during account delete routine
mam [Fri, 21 Feb 2014 21:27:48 +0000 (22:27 +0100)] 
bug 1138: removed blank admin log emtry during account delete routine

5 years agobug 1138: added return link to missing or wrong delete account request
mam [Fri, 21 Feb 2014 21:17:08 +0000 (22:17 +0100)] 
bug 1138: added return link to missing or wrong delete account request

5 years agobug 1138: rework of the return link
mam [Fri, 21 Feb 2014 20:57:51 +0000 (21:57 +0100)] 
bug 1138: rework of the return link

5 years agobug 1138: corrected the TD class
mam [Fri, 21 Feb 2014 20:09:32 +0000 (21:09 +0100)] 
bug 1138: corrected the TD class

5 years agobug 1138: added footer output if ticket no missing for pages/account/44.php and pages...
mam [Fri, 21 Feb 2014 06:57:14 +0000 (07:57 +0100)] 
bug 1138: added footer output if ticket no missing for pages/account/44.php and pages/account/59.php

5 years agobug 1138: changed rules for formatting the output of an email in the show history
mam [Fri, 21 Feb 2014 06:40:44 +0000 (07:40 +0100)] 
bug 1138: changed rules for formatting the output of an email in the show history

5 years agobug 1138: added ticket validation to account history view
mam [Tue, 18 Feb 2014 22:46:43 +0000 (23:46 +0100)] 
bug 1138: added ticket validation to account history view

5 years agobug 1138: added ticket validation for password reset
mam [Tue, 18 Feb 2014 22:26:46 +0000 (23:26 +0100)] 
bug 1138: added ticket validation for password reset

5 years agoMerge branch 'bug-1244' into release
Michael Tänzer [Wed, 5 Feb 2014 16:03:56 +0000 (17:03 +0100)] 
Merge branch 'bug-1244' into release

5 years agoMerge branch 'bug-1218' into release
Michael Tänzer [Wed, 5 Feb 2014 15:50:30 +0000 (16:50 +0100)] 
Merge branch 'bug-1218' into release

5 years agoMerge branch 'release' into bug-1138
Michael Tänzer [Tue, 4 Feb 2014 22:29:23 +0000 (23:29 +0100)] 
Merge branch 'release' into bug-1138

Conflicts:
includes/account.php
includes/notary.inc.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1244: Add introductory text to the front page.
Michael Tänzer [Tue, 4 Feb 2014 15:14:37 +0000 (16:14 +0100)] 
bug 1244: Add introductory text to the front page.

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge branch 'tarballs' into release
Michael Tänzer [Tue, 4 Feb 2014 14:59:43 +0000 (15:59 +0100)] 
Merge branch 'tarballs' into release

5 years agoSource code taken from cacert-20140115.tar.bz2
Michael Tänzer [Tue, 4 Feb 2014 14:58:59 +0000 (15:58 +0100)] 
Source code taken from cacert-20140115.tar.bz2

5 years agobug 1239: fixed typo for title bug-1239
INOPIAE [Tue, 28 Jan 2014 21:23:31 +0000 (22:23 +0100)] 
bug 1239: fixed typo for title

5 years agobug 448: changed the wording for the message after the revokation of a certificate
INOPIAE [Sun, 26 Jan 2014 16:50:12 +0000 (17:50 +0100)] 
bug 448: changed the wording for the message after the revokation of a certificate

5 years agobug 1138: added assurances to SE log, rework of assurance delete form delete assuranc...
INOPIAE [Mon, 20 Jan 2014 21:36:56 +0000 (22:36 +0100)] 
bug 1138: added assurances to SE log, rework of assurance delete form delete assurance to deleted=Now()

5 years agobug 1138: rework delete assurance SE log
INOPIAE [Mon, 20 Jan 2014 19:02:13 +0000 (20:02 +0100)] 
bug 1138: rework delete assurance SE log

5 years agobug 1138: changed status texts from AD to SE
INOPIAE [Mon, 20 Jan 2014 17:48:44 +0000 (18:48 +0100)] 
bug 1138: changed status texts from AD to SE

5 years agobug 1138: added SE log for account delete
INOPIAE [Mon, 20 Jan 2014 17:44:59 +0000 (18:44 +0100)] 
bug 1138: added SE log for account delete

5 years agobug 1138: added SE log for secret questions & answers
INOPIAE [Mon, 20 Jan 2014 17:31:37 +0000 (18:31 +0100)] 
bug 1138: added SE log for secret questions & answers

5 years agobug 1138: added revoke assurance routine
INOPIAE [Mon, 20 Jan 2014 16:15:18 +0000 (17:15 +0100)] 
bug 1138: added revoke assurance routine

5 years agobug 1138: inserted revoke certificate handling
INOPIAE [Mon, 20 Jan 2014 15:31:40 +0000 (16:31 +0100)] 
bug 1138: inserted revoke certificate handling

5 years agobug 1138: fixed sql statemanets
INOPIAE [Mon, 20 Jan 2014 08:23:53 +0000 (09:23 +0100)] 
bug 1138: fixed sql statemanets

5 years agobug 1138: rework of the SE log output
INOPIAE [Mon, 20 Jan 2014 07:17:51 +0000 (08:17 +0100)] 
bug 1138: rework of the SE log output

5 years agobug 1138: added the ticket no handling to password reset
INOPIAE [Sun, 19 Jan 2014 18:51:28 +0000 (19:51 +0100)] 
bug 1138: added the ticket no handling to password reset

5 years agobug 1138: changed ticket no handling
INOPIAE [Sun, 19 Jan 2014 18:36:32 +0000 (19:36 +0100)] 
bug 1138: changed ticket no handling

5 years agobug 1138: changed function se_write_log to write_se_log, changed ticket no handling
INOPIAE [Sun, 19 Jan 2014 17:45:35 +0000 (18:45 +0100)] 
bug 1138: changed function se_write_log to write_se_log, changed ticket no handling

5 years agobug 1138: changed Ticket form handling
INOPIAE [Sun, 19 Jan 2014 16:40:18 +0000 (17:40 +0100)] 
bug 1138: changed Ticket form handling

5 years agobug 1138: changed variable
INOPIAE [Sun, 19 Jan 2014 15:54:45 +0000 (16:54 +0100)] 
bug 1138: changed variable

5 years agoMerge remote-tracking branch 'origin/bug-440' into release
Michael Tänzer [Wed, 15 Jan 2014 00:25:47 +0000 (01:25 +0100)] 
Merge remote-tracking branch 'origin/bug-440' into release

5 years agoMerge branch 'release' into bug-440 bug-440
Michael Tänzer [Wed, 15 Jan 2014 00:15:15 +0000 (01:15 +0100)] 
Merge branch 'release' into bug-440

Conflicts:
includes/account.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge remote-tracking branch 'origin/bug-1137' into release
Michael Tänzer [Wed, 15 Jan 2014 00:03:11 +0000 (01:03 +0100)] 
Merge remote-tracking branch 'origin/bug-1137' into release

5 years agoMerge remote-tracking branch 'origin/bug-1195' into release
Michael Tänzer [Tue, 14 Jan 2014 23:56:16 +0000 (00:56 +0100)] 
Merge remote-tracking branch 'origin/bug-1195' into release